Changed to waitForExpectationsWithTimeout:handler

google · Oct 1, 2021 · 78c9061 · 78c9061
1 parent 9e4467a
commit 78c9061
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/Testing/integration/BUILD b/Testing/integration/BUILD
@@ -7,7 +7,7 @@ santa_unit_test(
         "//Source/santad/testdata:binaryrules_testdata",
     ],
     srcs = [
-        "SNTBenchmarkTest.m"
+        "SNTExecTest.m"
     ],
     deps = [],
     minimum_os_version = "10.15",

diff --git a/Testing/integration/SNTExecTest.m b/Testing/integration/SNTExecTest.m
@@ -31,17 +31,20 @@ - (void)checkExecution:(NSString *)path shouldExec:(BOOL)shouldExec {
   XCTestExpectation *expectation =
     [self expectationWithDescription:@"Wait for test binary to execute"];
 
+  __block NSTask *task = [[NSTask alloc] init];
   dispatch_async(dispatch_get_global_queue(QOS_CLASS_BACKGROUND, 0), ^{
-    NSTask *task = [[NSTask alloc] init];
     task.launchPath = path;
     [task launch];
-    while ([task isRunning])
-      usleep(100000);  // 0.1s
+    [task waitUntilExit];
     status = [task terminationStatus];
     [expectation fulfill];
   });
 
-  [self waitForExpectations:@[ expectation ] timeout:20.0];
+  [self waitForExpectationsWithTimeout:20.0
+                               handler:^(NSError *error) {
+                                 XCTAssertFalse([task isRunning], @"Test timed out: %@", error);
+                                 [task terminate];
+                               }];
 
   BOOL didExec = (status == 0);
   XCTAssertEqual(didExec, shouldExec);