Skip to content

Commit 6e5d33e

Browse files
committed
Make TestSubscriptionResumptionCapacityStep1 an async test
Eliminate use of ZCLSubscribeAttribute and embrace asyncio.
1 parent a8d5449 commit 6e5d33e

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

src/controller/python/test/test_scripts/base.py

+6-5
Original file line numberDiff line numberDiff line change
@@ -1426,25 +1426,26 @@ def OnValueReport(path: Attribute.TypedAttributePath, transaction: Attribute.Sub
14261426
controller 1 in container 1 while the Step2 is executed in controller 2 in container 2
14271427
'''
14281428

1429-
def TestSubscriptionResumptionCapacityStep1(self, nodeid: int, endpoint: int, passcode: int, subscription_capacity: int):
1429+
async def TestSubscriptionResumptionCapacityStep1(self, nodeid: int, endpoint: int, passcode: int, subscription_capacity: int):
14301430
try:
14311431
# BasicInformation Cluster, NodeLabel Attribute
14321432
for i in range(subscription_capacity):
1433-
self.devCtrl.ZCLSubscribeAttribute(
1434-
"BasicInformation", "NodeLabel", nodeid, endpoint, 1, 50, keepSubscriptions=True, autoResubscribe=False)
1433+
await self.devCtrl.ReadAttribute(nodeid, [(endpoint, Clusters.BasicInformation.Attributes.NodeLabel)], None,
1434+
False, reportInterval=(1, 50),
1435+
keepSubscriptions=True, autoResubscribe=False)
14351436

14361437
logger.info("Send OpenCommissioningWindow command on fist controller")
14371438
discriminator = 3840
14381439
salt = secrets.token_bytes(16)
14391440
iterations = 2000
14401441
verifier = GenerateVerifier(passcode, salt, iterations)
1441-
asyncio.run(self.devCtrl.SendCommand(
1442+
await self.devCtrl.SendCommand(
14421443
nodeid, 0, Clusters.AdministratorCommissioning.Commands.OpenCommissioningWindow(
14431444
commissioningTimeout=180,
14441445
PAKEPasscodeVerifier=verifier,
14451446
discriminator=discriminator,
14461447
iterations=iterations,
1447-
salt=salt), timedRequestTimeoutMs=10000))
1448+
salt=salt), timedRequestTimeoutMs=10000)
14481449
return True
14491450

14501451
except Exception as ex:

src/controller/python/test/test_scripts/subscription_resumption_capacity_test_ctrl1.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
# Commissioning test.
2121

22+
import asyncio
2223
import os
2324
import sys
2425
from optparse import OptionParser
@@ -113,8 +114,8 @@ def main():
113114
"Failed on on-network commissioing")
114115

115116
FailIfNot(
116-
test.TestSubscriptionResumptionCapacityStep1(
117-
options.nodeid, TEST_ENDPOINT_ID, options.setuppin, options.subscriptionCapacity),
117+
asyncio.run(test.TestSubscriptionResumptionCapacityStep1(
118+
options.nodeid, TEST_ENDPOINT_ID, options.setuppin, options.subscriptionCapacity)),
118119
"Failed on step 1 of testing subscription resumption capacity")
119120

120121
timeoutTicker.stop()

0 commit comments

Comments
 (0)