Rebase and fix conflicts, add some wait time to a test that sometimes…

… get delayed in Darwin test and reads the value too soon
project-chip · Jan 14, 2022 · 4c4a0ad · 4c4a0ad
1 parent 441cf95
commit 4c4a0ad
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/src/app/tests/suites/certification/Test_TC_LVL_3_1.yaml b/src/app/tests/suites/certification/Test_TC_LVL_3_1.yaml
@@ -120,7 +120,7 @@ tests:
       arguments:
           values:
               - name: "ms"
-                value: 10
+                value: 100
 
     - label: "reads CurrentLevel attribute from DUT"
       command: "readAttribute"

diff --git a/src/app/util/util.cpp b/src/app/util/util.cpp
@@ -984,14 +984,14 @@ uint8_t emberAfMake8bitEncodedChanPg(uint8_t page, uint8_t channel)
 bool emberAfContainsAttribute(chip::EndpointId endpoint, chip::ClusterId clusterId, chip::AttributeId attributeId, bool asServer)
 {
     uint8_t mask = asServer ? CLUSTER_MASK_SERVER : CLUSTER_MASK_CLIENT;
-    return (emberAfLocateAttributeMetadata(endpoint, clusterId, attributeId, mask, 0) != nullptr);
+    return (emberAfLocateAttributeMetadata(endpoint, clusterId, attributeId, mask) != nullptr);
 }
 
 bool emberAfIsNonVolatileAttribute(chip::EndpointId endpoint, chip::ClusterId clusterId, chip::AttributeId attributeId,
                                    bool asServer)
 {
     uint8_t mask                        = asServer ? CLUSTER_MASK_SERVER : CLUSTER_MASK_CLIENT;
-    EmberAfAttributeMetadata * metadata = emberAfLocateAttributeMetadata(endpoint, clusterId, attributeId, mask, 0);
+    EmberAfAttributeMetadata * metadata = emberAfLocateAttributeMetadata(endpoint, clusterId, attributeId, mask);
 
     if (metadata == nullptr)
     {

diff --git a/src/darwin/Framework/CHIPTests/CHIPClustersTests.m b/src/darwin/Framework/CHIPTests/CHIPClustersTests.m
diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h