Merge branch 'google:main' into replace-semaphore

google · Oct 6, 2022 · a162c0e · a162c0e
2 parents a087755 + 54923d8
commit a162c0e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/.github/workflows/swiftpm.yml b/.github/workflows/swiftpm.yml
@@ -70,7 +70,7 @@ jobs:
             DESTINATION="platform=tvOS Simulator,name=Apple TV,OS=latest"
             ;;
           watchos)
-            DESTINATION="platform=WatchOS Simulator,name=Apple Watch Series 7 - 45mm,OS=latest"
+            DESTINATION="platform=WatchOS Simulator,name=Apple Watch Series 7 (45mm),OS=latest"
             ;;
         esac
 

diff --git a/UnitTests/GTMSessionFetcherFetchingTest.m b/UnitTests/GTMSessionFetcherFetchingTest.m
@@ -1903,7 +1903,7 @@ - (void)testInsecureRequests {
         testResponse(nil, [NSData data], nil);
       };
 
-  CREATE_START_STOP_NOTIFICATION_EXPECTATIONS(10, 10);
+  CREATE_START_STOP_NOTIFICATION_EXPECTATIONS(6, 6);
 
   for (int i = 0; records[i].urlString; i++) {
     NSString *urlString = records[i].urlString;

diff --git a/UnitTests/GTMSessionFetcherServiceTest.m b/UnitTests/GTMSessionFetcherServiceTest.m
@@ -434,6 +434,7 @@ - (void)testConcurrentCallbackQueue {
   if (!_isServerRunning) return;
 
   GTMSessionFetcherService *service = [[GTMSessionFetcherService alloc] init];
+  service.allowLocalhostRequest = YES;
   [service setConcurrentCallbackQueue:dispatch_get_global_queue(QOS_CLASS_USER_INITIATED, 0)];
 
   XCTestExpectation *progressExpectation = [self expectationWithDescription:@"progress block"];
@@ -1541,6 +1542,7 @@ - (void)testFetcherUsingMetricsCollectionBlockFromFetcherService API_AVAILABLE(i
   __block NSURLSessionTaskMetrics *collectedMetrics = nil;
 
   GTMSessionFetcherService *service = [[GTMSessionFetcherService alloc] init];
+  service.allowLocalhostRequest = YES;
   service.metricsCollectionBlock = ^(NSURLSessionTaskMetrics *_Nonnull metrics) {
     collectedMetrics = metrics;
   };