Fix Tsan for eDO channel tests.

PiperOrigin-RevId: 323894097

Author: AlbertWang0116

Channel/Tests/EDOBlockingQueueTest.m

@@ -78,6 +78,7 @@ - (void)testAddAndFetchObjectsInOrderInDifferentQueue {
 }
 
 - (void)testAddAndFetchObjectsConcurrently {
+  dispatch_queue_t testQueue = dispatch_queue_create("com.google.edo.test", DISPATCH_QUEUE_SERIAL);
   EDOBlockingQueue<NSObject *> *blockingQueue = [[EDOBlockingQueue alloc] init];
   NSArray<NSObject *> *objects = [self objects];
 
@@ -88,15 +89,20 @@ - (void)testAddAndFetchObjectsConcurrently {
   }
 
   XCTestExpectation *expectFetchAll = [self expectationWithDescription:@"All objects are fetched."];
+  expectFetchAll.expectedFulfillmentCount = objects.count;
   dispatch_async(dispatch_get_global_queue(QOS_CLASS_DEFAULT, 0), ^{
     dispatch_apply(objects.count, dispatch_get_global_queue(QOS_CLASS_DEFAULT, 0), ^(size_t idx) {
+      NSObject *object;
       if (idx % 2) {
-        fetchedObjects[idx] = [blockingQueue firstObjectWithTimeout:DISPATCH_TIME_FOREVER];
+        object = [blockingQueue firstObjectWithTimeout:DISPATCH_TIME_FOREVER];
       } else {
-        fetchedObjects[idx] = [blockingQueue lastObjectWithTimeout:DISPATCH_TIME_FOREVER];
+        object = [blockingQueue lastObjectWithTimeout:DISPATCH_TIME_FOREVER];
       }
+      dispatch_async(testQueue, ^{
+        fetchedObjects[idx] = object;
+        [expectFetchAll fulfill];
+      });
     });
-    [expectFetchAll fulfill];
   });
 
   dispatch_apply(objects.count, dispatch_get_global_queue(QOS_CLASS_DEFAULT, 0), ^(size_t idx) {

Channel/Tests/EDOChannelForwarderTest.m

@@ -171,6 +171,7 @@ - (void)testNoChannelAfterForwarderStop {
 }
 
 - (void)testMultipleForwarderCanConnectMultiplexerAndForward {
+  dispatch_queue_t testQueue = dispatch_queue_create("com.google.edo.test", DISPATCH_QUEUE_SERIAL);
   int numOfForwarders = 20;
   NS_VALID_UNTIL_END_OF_SCOPE NSMutableArray<id> *savedForwarders = [[NSMutableArray alloc] init];
   // Add the placeholders first.
@@ -187,7 +188,9 @@ - (void)testMultipleForwarderCanConnectMultiplexerAndForward {
 
       XCTAssertNotNil([forwarder startWithErrorHandler:^(EDOForwarderError errorCode){
       }]);
-      savedForwarders[idx] = forwarder;
+      dispatch_async(testQueue, ^{
+        savedForwarders[idx] = forwarder;
+      });
     });
   });
 

Channel/Tests/EDOChannelMultiplexerTest.m

@@ -134,6 +134,7 @@ - (void)testMultiplexerCanFetchForwardedChannelWithHostPort {
 }
 
 - (void)testCanFetchChannelWithHostPortConcurrently {
+  dispatch_queue_t testQueue = dispatch_queue_create("com.google.edo.test", DISPATCH_QUEUE_SERIAL);
   int numOfChannels = 200;
   EDOChannelMultiplexer *multiplexer = [[EDOChannelMultiplexer alloc] init];
   [multiplexer start:nil error:nil];
@@ -158,7 +159,9 @@ - (void)testCanFetchChannelWithHostPortConcurrently {
         XCTAssertEqualObjects(port, receivedPort);
         [channel sendData:deviceIdentifier withCompletionHandler:nil];
       }];
-      savedChannels[idx] = channel;
+      dispatch_async(testQueue, ^{
+        savedChannels[idx] = channel;
+      });
     });
   });
 
@@ -175,6 +178,7 @@ - (void)testCanFetchChannelWithHostPortConcurrently {
 }
 
 - (void)testCanFetchChannelWithBothCorrectAndIncorrectAckConcurrently {
+  dispatch_queue_t testQueue = dispatch_queue_create("com.google.edo.test", DISPATCH_QUEUE_SERIAL);
   int numOfChannels = 30;
   EDOChannelMultiplexer *multiplexer = [[EDOChannelMultiplexer alloc] init];
   [multiplexer start:nil error:nil];
@@ -184,6 +188,7 @@ - (void)testCanFetchChannelWithBothCorrectAndIncorrectAckConcurrently {
   NSData *deviceInfo = [@"info" dataUsingEncoding:NSUTF8StringEncoding];
   NSData *incorrectAck = [@"deadbeef" dataUsingEncoding:NSUTF8StringEncoding];
   XCTestExpectation *expectChannelCreated = [self expectationWithDescription:@"Channels created."];
+  expectChannelCreated.expectedFulfillmentCount = numOfChannels;
 
   NS_VALID_UNTIL_END_OF_SCOPE NSMutableArray<id> *savedChannels = [[NSMutableArray alloc] init];
   // Add the placeholders first.
@@ -221,9 +226,11 @@ - (void)testCanFetchChannelWithBothCorrectAndIncorrectAckConcurrently {
           [channel sendData:deviceIdentifier withCompletionHandler:nil];
         }];
       }
-      savedChannels[idx] = channel;
+      dispatch_async(testQueue, ^{
+        savedChannels[idx] = channel;
+        [expectChannelCreated fulfill];
+      });
     });
-    [expectChannelCreated fulfill];
   });
 
   int numOfBadChannels = (numOfChannels + 1) / 3;