Fixed unit test race condition

jtung-apple · Mar 13, 2024 · 62ff45e · 62ff45e
1 parent 1191da7
commit 62ff45e
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/darwin/Framework/CHIPTests/MTRPerControllerStorageTests.m b/src/darwin/Framework/CHIPTests/MTRPerControllerStorageTests.m
@@ -1142,16 +1142,20 @@ - (void)test008_TestDataStoreDirect
     // Test MTRDeviceControllerDataStore _pruneEmptyStoredAttributesBranches
     //  - Clear cache
     //  - Store an attribute
-    //  - Manually delete it from the user defaults
+    //  - Manually delete it from the test storage delegate
     //  - Call _pruneEmptyStoredAttributesBranches
     [controller.controllerDataStore clearAllStoredAttributes];
 
     NSArray * testAttribute = @[
         @{ MTRAttributePathKey : [MTRAttributePath attributePathWithEndpointID:@(1) clusterID:@(1) attributeID:@(1)], MTRDataKey : @ { MTRTypeKey : MTRUnsignedIntegerValueType, MTRValueKey : @(111) } },
     ];
     [controller.controllerDataStore storeAttributeValues:testAttribute forNodeID:@(2001)];
-    NSString * testAttributeValueKey = [controller.controllerDataStore _attributeValueKeyForNodeID:@(2001) endpointID:@(1) clusterID:@(1) attributeID:@(1)];
-    [storageDelegate controller:controller removeValueForKey:testAttributeValueKey securityLevel:MTRStorageSecurityLevelSecure sharingType:MTRStorageSharingTypeNotShared];
+
+    // store is async, so remove on the same queue to ensure order
+    dispatch_sync(_storageQueue, ^{
+        NSString * testAttributeValueKey = [controller.controllerDataStore _attributeValueKeyForNodeID:@(2001) endpointID:@(1) clusterID:@(1) attributeID:@(1)];
+        [storageDelegate controller:controller removeValueForKey:testAttributeValueKey securityLevel:MTRStorageSecurityLevelSecure sharingType:MTRStorageSharingTypeNotShared];
+    });
     [controller.controllerDataStore unitTestPruneEmptyStoredAttributesBranches];
 
     // Now check the indexes are pruned