From 6ec648338ee36bfc9e4656bbc07c1f75337ae590 Mon Sep 17 00:00:00 2001 From: Vivien Nicolas Date: Tue, 15 Feb 2022 19:46:37 +0100 Subject: [PATCH] [YAML] Update some subscriptions maxInterval to be under the timeout for darwin tests (#15198) --- src/app/tests/suites/TestCluster.yaml | 2 +- src/app/tests/suites/TestSubscribe_OnOff.yaml | 2 +- src/darwin/Framework/CHIP/templates/clusters-tests.zapt | 2 +- src/darwin/Framework/CHIPTests/CHIPClustersTests.m | 6 +++--- zzz_generated/chip-tool/zap-generated/test/Commands.h | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/app/tests/suites/TestCluster.yaml b/src/app/tests/suites/TestCluster.yaml index a7593bd53e5d1e..be344f57d4270d 100644 --- a/src/app/tests/suites/TestCluster.yaml +++ b/src/app/tests/suites/TestCluster.yaml @@ -2894,7 +2894,7 @@ tests: command: "subscribeAttribute" attribute: "list_int8u" minInterval: 2 - maxInterval: 10 + maxInterval: 5 response: value: [1, 2, 3, 4] diff --git a/src/app/tests/suites/TestSubscribe_OnOff.yaml b/src/app/tests/suites/TestSubscribe_OnOff.yaml index c8d7a82e8d71a3..ba1b4bd7952dd5 100644 --- a/src/app/tests/suites/TestSubscribe_OnOff.yaml +++ b/src/app/tests/suites/TestSubscribe_OnOff.yaml @@ -35,7 +35,7 @@ tests: command: "subscribeAttribute" attribute: "OnOff" minInterval: 2 - maxInterval: 10 + maxInterval: 5 response: value: false diff --git a/src/darwin/Framework/CHIP/templates/clusters-tests.zapt b/src/darwin/Framework/CHIP/templates/clusters-tests.zapt index ff5e2bf07fcc27..086de3ea69d781 100644 --- a/src/darwin/Framework/CHIP/templates/clusters-tests.zapt +++ b/src/darwin/Framework/CHIP/templates/clusters-tests.zapt @@ -19,7 +19,7 @@ const uint16_t kPairingTimeoutInSeconds = 10; const uint16_t kAddressResolveTimeoutInSeconds = 10; const uint16_t kCASESetupTimeoutInSeconds = 30; -const uint16_t kTimeoutInSeconds = 5; +const uint16_t kTimeoutInSeconds = 20; const uint64_t nodeId = 0x12344321; const uint16_t kDiscriminator = 3840; const uint32_t kSetupPINCode = 20202021; diff --git a/src/darwin/Framework/CHIPTests/CHIPClustersTests.m b/src/darwin/Framework/CHIPTests/CHIPClustersTests.m index 34a5c0aad2a901..85a3c4f91afa62 100644 --- a/src/darwin/Framework/CHIPTests/CHIPClustersTests.m +++ b/src/darwin/Framework/CHIPTests/CHIPClustersTests.m @@ -36,7 +36,7 @@ const uint16_t kPairingTimeoutInSeconds = 10; const uint16_t kAddressResolveTimeoutInSeconds = 10; const uint16_t kCASESetupTimeoutInSeconds = 30; -const uint16_t kTimeoutInSeconds = 5; +const uint16_t kTimeoutInSeconds = 20; const uint64_t nodeId = 0x12344321; const uint16_t kDiscriminator = 3840; const uint32_t kSetupPINCode = 20202021; @@ -36970,7 +36970,7 @@ - (void)testSendClusterTestCluster_000367_SubscribeAttribute XCTAssertNotNil(cluster); uint16_t minIntervalArgument = 2U; - uint16_t maxIntervalArgument = 10U; + uint16_t maxIntervalArgument = 5U; [cluster subscribeAttributeListInt8uWithMinInterval:@(minIntervalArgument) maxInterval:@(maxIntervalArgument) subscriptionEstablished:^{ @@ -45212,7 +45212,7 @@ - (void)testSendClusterTestSubscribe_OnOff_000003_SubscribeAttribute XCTAssertNotNil(cluster); uint16_t minIntervalArgument = 2U; - uint16_t maxIntervalArgument = 10U; + uint16_t maxIntervalArgument = 5U; [cluster subscribeAttributeOnOffWithMinInterval:@(minIntervalArgument) maxInterval:@(maxIntervalArgument) subscriptionEstablished:^{ diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h index 88a1397abed072..1eca144f37e5c5 100644 --- a/zzz_generated/chip-tool/zap-generated/test/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h @@ -69895,7 +69895,7 @@ class TestCluster : public TestCommand uint16_t minIntervalArgument; minIntervalArgument = 2U; uint16_t maxIntervalArgument; - maxIntervalArgument = 10U; + maxIntervalArgument = 5U; ReturnErrorOnFailure(cluster.SubscribeAttribute( this, OnSuccessCallback_367, OnFailureCallback_367, minIntervalArgument, maxIntervalArgument, @@ -81676,7 +81676,7 @@ class TestSubscribe_OnOff : public TestCommand uint16_t minIntervalArgument; minIntervalArgument = 2U; uint16_t maxIntervalArgument; - maxIntervalArgument = 10U; + maxIntervalArgument = 5U; ReturnErrorOnFailure(cluster.SubscribeAttribute( this, OnSuccessCallback_3, OnFailureCallback_3, minIntervalArgument, maxIntervalArgument, OnSubscriptionEstablished_3));