Merge 1b2e704 into d1fffb4

google · Aug 25, 2021 · cdc6447 · cdc6447
2 parents d1fffb4 + 1b2e704
commit cdc6447
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/Source/santad/EventProviders/SNTEndpointSecurityManagerTest.mm b/Source/santad/EventProviders/SNTEndpointSecurityManagerTest.mm
@@ -86,7 +86,7 @@ - (void)testDenyOnTimeout {
 
   [mockES triggerHandler:&m];
 
-  [self waitForExpectationsWithTimeout:10.0
+  [self waitForExpectationsWithTimeout:30.0
                                handler:^(NSError *error) {
                                  if (error) {
                                    XCTFail(@"Santa auth test timed out without receiving two "
@@ -147,7 +147,7 @@ - (void)testDeleteRulesDB {
     };
     [mockES triggerHandler:&m];
 
-    [self waitForExpectationsWithTimeout:10.0
+    [self waitForExpectationsWithTimeout:30.0
                                  handler:^(NSError *error) {
                                    if (error) {
                                      XCTFail(@"Santa auth test timed out with error: %@", error);
@@ -199,7 +199,7 @@ - (void)testSkipOtherESEvents {
   };
 
   [mockES triggerHandler:&m];
-  [self waitForExpectationsWithTimeout:10.0
+  [self waitForExpectationsWithTimeout:30.0
                                handler:^(NSError *error) {
                                  if (error) {
                                    XCTFail(@"Santa auth test timed out with error: %@", error);
@@ -261,7 +261,7 @@ - (void)testRenameOverwriteRulesDB {
     };
     [mockES triggerHandler:&m];
 
-    [self waitForExpectationsWithTimeout:10.0
+    [self waitForExpectationsWithTimeout:30.0
                                  handler:^(NSError *error) {
                                    if (error) {
                                      XCTFail(@"Santa auth test timed out with error: %@", error);
@@ -334,7 +334,7 @@ - (void)testRenameRulesDB {
     };
     [mockES triggerHandler:&m];
 
-    [self waitForExpectationsWithTimeout:10.0
+    [self waitForExpectationsWithTimeout:30.0
                                  handler:^(NSError *error) {
                                    if (error) {
                                      XCTFail(@"Santa auth test timed out with error: %@", error);

diff --git a/Source/santad/SNTApplicationTest.m b/Source/santad/SNTApplicationTest.m
@@ -63,7 +63,7 @@ - (void)checkBinaryExecution:(NSString *)binaryName
     [santaInit fulfill];
   });
 
-  [self waitForExpectationsWithTimeout:5.0
+  [self waitForExpectationsWithTimeout:30.0
                                handler:^(NSError *error) {
                                  if (error) {
                                    XCTFail(@"Santa's subscription to EndpointSecurity timed out "
@@ -104,7 +104,7 @@ - (void)checkBinaryExecution:(NSString *)binaryName
   es_events_t event = {.exec = exec_event};
   es_message_t m = {
     .version = 4,
-    .mach_time = 181576143417379,
+    .mach_time = DISPATCH_TIME_NOW,
     .deadline = DISPATCH_TIME_FOREVER,
     .process = &proc,
     .seq_num = 1,
@@ -116,7 +116,7 @@ - (void)checkBinaryExecution:(NSString *)binaryName
   [mockES triggerHandler:&m];
 
   [self
-    waitForExpectationsWithTimeout:5.0
+    waitForExpectationsWithTimeout:30.0
                            handler:^(NSError *error) {
                              if (error) {
                                XCTFail(