[Darwin] Reduce the tests timeout from 10 seconds to 3 (#6415)

project-chip · Jul 3, 2021 · 1110674 · 1110674
1 parent 4d9dfd8
commit 1110674
Show file tree

Hide file tree

Showing 2 changed files with 195 additions and 182 deletions.
diff --git a/src/darwin/Framework/CHIP/templates/clusters-tests.zapt b/src/darwin/Framework/CHIP/templates/clusters-tests.zapt
@@ -27,7 +27,8 @@
 // system dependencies
 #import <XCTest/XCTest.h>
 
-const uint16_t kTimeoutInMs = 10;
+const uint16_t kPairingTimeoutInSeconds = 10;
+const uint16_t kTimeoutInSeconds = 3;
 const uint64_t kDeviceId = 1;
 const uint16_t kDiscriminator = 3840;
 const uint32_t kSetupPINCode = 20202021;
@@ -75,6 +76,11 @@ CHIPDevice * GetPairedDevice(uint64_t deviceId)
 
 @implementation CHIPClustersTests
 
+- (void)setUp {
+    [super setUp];
+    [self setContinueAfterFailure:NO];
+}
+
 - (void)testInitStack
 {
     XCTestExpectation * expectation = [self expectationWithDescription:@"Pairing Complete"];
@@ -100,7 +106,7 @@ CHIPDevice * GetPairedDevice(uint64_t deviceId)
                      error:&error];
     XCTAssertEqual(error.code, 0);
 
-    [self waitForExpectationsWithTimeout:kTimeoutInMs handler:nil];
+    [self waitForExpectationsWithTimeout:kPairingTimeoutInSeconds handler:nil];
 }
 
 - (void)testShutdownStack
@@ -134,7 +140,7 @@ CHIPDevice * GetPairedDevice(uint64_t deviceId)
         [expectation fulfill];
     }];
 
-    [self waitForExpectationsWithTimeout:kTimeoutInMs handler:nil];
+    [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil];
 }
 {{/unless}}
 {{/chip_server_cluster_commands}}
@@ -157,7 +163,7 @@ CHIPDevice * GetPairedDevice(uint64_t deviceId)
         [expectation fulfill];
     }];
 
-    [self waitForExpectationsWithTimeout:kTimeoutInMs handler:nil];
+    [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil];
 }
 
 {{#if (isWritableAttribute)}}
@@ -177,7 +183,7 @@ CHIPDevice * GetPairedDevice(uint64_t deviceId)
         [expectation fulfill];
     }];
 
-    [self waitForExpectationsWithTimeout:kTimeoutInMs handler:nil];
+    [self waitForExpectationsWithTimeout:kTimeoutInSeconds handler:nil];
 }
 {{/if}}
 {{/chip_server_cluster_attributes}}