Fix subscription test

project-chip · Jul 2, 2022 · 280b113 · 280b113
1 parent 1519afc
commit 280b113
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/src/darwin/Framework/CHIPTests/MTRDeviceTests.m b/src/darwin/Framework/CHIPTests/MTRDeviceTests.m
@@ -708,17 +708,28 @@ - (void)test011_ReadCachedAttribute
     XCTestExpectation * subscribeExpectation = [self expectationWithDescription:@"Subscription complete"];
 
     NSLog(@"Subscribing...");
+    __block void (^reportHandler)(NSArray * _Nullable value, NSError * _Nullable error);
     [device subscribeWithQueue:queue
         minInterval:2
         maxInterval:60
         params:nil
         cacheContainer:attributeCacheContainer
         attributeReportHandler:^(NSArray * value) {
             NSLog(@"Received report: %@", value);
+            if (reportHandler) {
+              __auto_type handler = reportHandler;
+              reportHandler = nil;
+              handler(value, nil);
+            }
         }
         eventReportHandler:nil
         errorHandler:^(NSError * error) {
             NSLog(@"Received report error: %@", error);
+            if (reportHandler) {
+              __auto_type handler = reportHandler;
+              reportHandler = nil;
+              handler(nil, error);
+            }
         }
         subscriptionEstablished:^() {
             [subscribeExpectation fulfill];
@@ -774,7 +785,6 @@ - (void)test011_ReadCachedAttribute
     [self waitForExpectations:[NSArray arrayWithObject:newSubscriptionEstablished] timeout:kTimeoutInSeconds];
 
     __auto_type reportExpectation = [self expectationWithDescription:@"Report handler called"];
-    __block void (^reportHandler)(NSArray * _Nullable value, NSError * _Nullable error);
     reportHandler = ^(NSArray * _Nullable value, NSError * _Nullable error) {
         NSLog(@"Report received: %@, error: %@", value, error);
         for (MTRAttributeReport * report in value) {