1 files changed, 17 insertions, 11 deletions

diff --git a/pw_transfer/transfer_thread_test.cc b/pw_transfer/transfer_thread_test.cc
index d83f8298d..0df41ec6f 100644
--- a/pw_transfer/transfer_thread_test.cc
+++ b/pw_transfer/transfer_thread_test.cc
@@ -32,6 +32,10 @@ namespace {
 
 using internal::Chunk;
 
+// Effectively unlimited timeout as these tests should never hit it.
+constexpr chrono::SystemClock::duration kNeverTimeout =
+    std::chrono::seconds(60);
+
 // TODO(frolv): Have a generic way to obtain a thread for testing on any system.
 thread::Options& TransferThreadOptions() {
   static thread::stl::Options options;
@@ -111,7 +115,7 @@ TEST_F(TransferThreadTest, AddTransferHandler) {
                                        3,
                                        {},
                                        max_parameters_,
-                                       std::chrono::seconds(2),
+                                       kNeverTimeout,
                                        3,
                                        10);
 
@@ -136,7 +140,7 @@ TEST_F(TransferThreadTest, RemoveTransferHandler) {
                                        3,
                                        {},
                                        max_parameters_,
-                                       std::chrono::seconds(2),
+                                       kNeverTimeout,
                                        3,
                                        10);
 
@@ -173,7 +177,7 @@ TEST_F(TransferThreadTest, ProcessChunk_SendsWindow) {
                 .set_max_chunk_size_bytes(8)
                 .set_offset(0)),
         max_parameters_,
-        std::chrono::seconds(2),
+        kNeverTimeout,
         3,
         10);
   });
@@ -220,7 +224,7 @@ TEST_F(TransferThreadTest, StartTransferExhausted_Server) {
               .set_max_chunk_size_bytes(8)
               .set_offset(0)),
       max_parameters_,
-      std::chrono::seconds(2),
+      kNeverTimeout,
       3,
       10);
   transfer_thread_.WaitUntilEventIsProcessed();
@@ -244,7 +248,7 @@ TEST_F(TransferThreadTest, StartTransferExhausted_Server) {
               .set_max_chunk_size_bytes(8)
               .set_offset(0)),
       max_parameters_,
-      std::chrono::seconds(2),
+      kNeverTimeout,
       3,
       10);
   transfer_thread_.WaitUntilEventIsProcessed();
@@ -279,7 +283,8 @@ TEST_F(TransferThreadTest, StartTransferExhausted_Client) {
       &buffer3,
       max_parameters_,
       [&status3](Status status) { status3 = status; },
-      std::chrono::seconds(2),
+      kNeverTimeout,
+      kNeverTimeout,
       3,
       10);
   transfer_thread_.WaitUntilEventIsProcessed();
@@ -296,7 +301,8 @@ TEST_F(TransferThreadTest, StartTransferExhausted_Client) {
       &buffer4,
       max_parameters_,
       [&status4](Status status) { status4 = status; },
-      std::chrono::seconds(2),
+      kNeverTimeout,
+      kNeverTimeout,
       3,
       10);
   transfer_thread_.WaitUntilEventIsProcessed();
@@ -322,7 +328,7 @@ TEST_F(TransferThreadTest, VersionTwo_NoHandler) {
                                        /*resource_id=*/7,
                                        {},
                                        max_parameters_,
-                                       std::chrono::seconds(2),
+                                       kNeverTimeout,
                                        3,
                                        10);
 
@@ -333,10 +339,10 @@ TEST_F(TransferThreadTest, VersionTwo_NoHandler) {
   ASSERT_EQ(ctx_.total_responses(), 1u);
   Result<Chunk::Identifier> id = Chunk::ExtractIdentifier(ctx_.response());
   ASSERT_TRUE(id.ok());
-  EXPECT_EQ(id->value(), 7u);
+  EXPECT_EQ(id->value(), 421u);
   auto chunk = DecodeChunk(ctx_.response());
-  EXPECT_EQ(chunk.session_id(), 7u);
-  EXPECT_EQ(chunk.resource_id(), 7u);
+  EXPECT_EQ(chunk.session_id(), 421u);
+  EXPECT_FALSE(chunk.resource_id().has_value());
   ASSERT_TRUE(chunk.status().has_value());
   EXPECT_EQ(chunk.status().value(), Status::NotFound());