Fix unit test

Author: jtung-apple

src/darwin/Framework/CHIPTests/MTRDeviceTests.m

@@ -242,6 +242,7 @@ - (void)tearDown
     // existing subscriptions and then fail out due to requesting a subscribe to
     // a nonexistent cluster.
     if (mConnectedDevice != nil) {
+        NSLog(@"JEFFTEST: teardown - unsubscribe");
         dispatch_queue_t queue = dispatch_get_main_queue();
 
         MTRSubscribeParams * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(0) maxInterval:@(10)];
@@ -3679,7 +3680,7 @@ - (void)test036_TestStorageBehaviorConfiguration
 
     __auto_type * device = [MTRDevice deviceWithNodeID:kDeviceId deviceController:sController];
 
-    __auto_type * delegate = [[MTRDeviceTestDelegate alloc] init];
+    __auto_type * delegate = [[MTRDeviceTestDelegateWithSubscriptionSetupOverride alloc] init];
     __block os_unfair_lock lock = OS_UNFAIR_LOCK_INIT;
     __block NSDate * reportEndTime = nil;
     __block NSDate * dataPersistedTime = nil;
@@ -3832,9 +3833,10 @@ - (void)test036_TestStorageBehaviorConfiguration
     os_unfair_lock_lock(&lock);
     reportToPersistenceDelay = [dataPersistedTime timeIntervalSinceDate:reportEndTime];
     os_unfair_lock_unlock(&lock);
-    // Check delay exists and approximately base delay times 3
+    // Check delay exists and at least base delay times 3
     XCTAssertGreaterThan(reportToPersistenceDelay, baseTestDelayTime * 3 * 0.9);
-    XCTAssertLessThan(reportToPersistenceDelay, baseTestDelayTime * 3 * 1.3); // larger upper limit in case machine is slow
+    // upper limit at most max delay times full multiplier + extra in case machine is slow
+    XCTAssertLessThan(reportToPersistenceDelay, baseTestDelayTime * 2 * 5 * 1.3);
 
     // Test 4: test reporting excessively, and see that persistence does not happen until
     // reporting frequency goes back above the threshold
@@ -3888,6 +3890,9 @@ - (void)test036_TestStorageBehaviorConfiguration
     [device unitTestInjectAttributeReport:attributeReport fromSubscription:YES];
 
     [self waitForExpectations:@[ dataPersisted4 ] timeout:60];
+
+    delegate.onReportEnd = nil;
+    delegate.onClusterDataPersisted = nil;
 }
 
 @end

src/darwin/Framework/CHIPTests/TestHelpers/MTRDeviceTestDelegate.h

@@ -34,8 +34,11 @@ typedef void (^MTRDeviceTestDelegateDataHandler)(NSArray<NSDictionary<NSString *
 @property (nonatomic) BOOL pretendThreadEnabled;
 @property (nonatomic, nullable) dispatch_block_t onSubscriptionPoolDequeue;
 @property (nonatomic, nullable) dispatch_block_t onSubscriptionPoolWorkComplete;
-@property (nonatomic) BOOL skipSetupSubscription;
 @property (nonatomic, nullable) dispatch_block_t onClusterDataPersisted;
 @end
 
+@interface MTRDeviceTestDelegateWithSubscriptionSetupOverride : MTRDeviceTestDelegate
+@property (nonatomic) BOOL skipSetupSubscription;
+@end
+
 NS_ASSUME_NONNULL_END

src/darwin/Framework/CHIPTests/TestHelpers/MTRDeviceTestDelegate.m

@@ -96,11 +96,6 @@ - (void)unitTestSubscriptionPoolWorkComplete:(MTRDevice *)device
     }
 }
 
-- (BOOL)unitTestShouldSetUpSubscriptionForDevice:(MTRDevice *)device
-{
-    return !_skipSetupSubscription;
-}
-
 - (void)unitTestClusterDataPersisted:(MTRDevice *)device
 {
     if (self.onClusterDataPersisted != nil) {
@@ -109,3 +104,12 @@ - (void)unitTestClusterDataPersisted:(MTRDevice *)device
 }
 
 @end
+
+@implementation MTRDeviceTestDelegateWithSubscriptionSetupOverride
+
+- (BOOL)unitTestShouldSetUpSubscriptionForDevice:(MTRDevice *)device
+{
+    return !_skipSetupSubscription;
+}
+
+@end