Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Python] Eliminate ZCLSubscribeAttribute #33337

Merged
merged 9 commits into from
May 13, 2024
Merged

[Python] Eliminate ZCLSubscribeAttribute #33337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5f79b64
Use asyncio sleep to unblock asyncio event loop
agners Mar 9, 2024
93b4d2e
Avoid fixed sleep in TestCaseEviction
agners Mar 14, 2024
8e81418
Make TestSubscription an async test
agners Mar 14, 2024
d43d2cb
Make TestSubscriptionResumption an async test
agners Mar 14, 2024
f834bed
Make TestSubscriptionResumptionCapacityStep1 an async test
agners May 7, 2024
90e37dd
Make TestSubscriptionResumptionCapacityStep2 an async test
agners May 7, 2024
e322382
Remove ZCLSubscribeAttribute from subscription_resumption_timeout_test
agners May 7, 2024
a027d22
Rewrite TestWriteBasicAttributes to drop ZCLRead/WriteAttribute
agners May 7, 2024
8d4914f
Improve wait for end of update task in TestSubscription
agners May 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
219 changes: 107 additions & 112 deletions src/controller/python/test/test_scripts/base.py
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 4 additions & 5 deletions src/controller/python/test/test_scripts/mobile-device-test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,9 +129,8 @@ def TestDatamodel(test: BaseTestHelper, device_nodeid: int):
"Failed to test Read Basic Attributes")

logger.info("Testing attribute writing")
FailIfNot(test.TestWriteBasicAttributes(nodeid=device_nodeid,
endpoint=ENDPOINT_ID,
group=GROUP_ID),
FailIfNot(asyncio.run(test.TestWriteBasicAttributes(nodeid=device_nodeid,
endpoint=ENDPOINT_ID)),
"Failed to test Write Basic Attributes")

logger.info("Testing attribute reading basic again")
Expand All @@ -141,11 +140,11 @@ def TestDatamodel(test: BaseTestHelper, device_nodeid: int):
"Failed to test Read Basic Attributes")

logger.info("Testing subscription")
FailIfNot(test.TestSubscription(nodeid=device_nodeid, endpoint=LIGHTING_ENDPOINT_ID),
FailIfNot(asyncio.run(test.TestSubscription(nodeid=device_nodeid, endpoint=LIGHTING_ENDPOINT_ID)),
"Failed to subscribe attributes.")

logger.info("Testing another subscription that kills previous subscriptions")
FailIfNot(test.TestSubscription(nodeid=device_nodeid, endpoint=LIGHTING_ENDPOINT_ID),
FailIfNot(asyncio.run(test.TestSubscription(nodeid=device_nodeid, endpoint=LIGHTING_ENDPOINT_ID)),
"Failed to subscribe attributes.")

logger.info("Testing re-subscription")
Expand Down
5 changes: 3 additions & 2 deletions src/controller/python/test/test_scripts/subscription_resumption_capacity_test_ctrl1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

# Commissioning test.

import asyncio
import os
import sys
from optparse import OptionParser
Expand Down Expand Up @@ -113,8 +114,8 @@ def main():
"Failed on on-network commissioing")

FailIfNot(
test.TestSubscriptionResumptionCapacityStep1(
options.nodeid, TEST_ENDPOINT_ID, options.setuppin, options.subscriptionCapacity),
asyncio.run(test.TestSubscriptionResumptionCapacityStep1(
options.nodeid, TEST_ENDPOINT_ID, options.setuppin, options.subscriptionCapacity)),
"Failed on step 1 of testing subscription resumption capacity")

timeoutTicker.stop()
Expand Down
6 changes: 4 additions & 2 deletions src/controller/python/test/test_scripts/subscription_resumption_capacity_test_ctrl2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

# Commissioning test.

import asyncio
import os
import sys
from optparse import OptionParser
Expand Down Expand Up @@ -125,8 +126,9 @@ def main():
"Failed on on-network commissioing")

FailIfNot(
test.TestSubscriptionResumptionCapacityStep2(options.nodeid, TEST_ENDPOINT_ID, options.deviceAddress,
TEST_SSH_PORT, options.remoteServerApp, options.subscriptionCapacity),
asyncio.run(
test.TestSubscriptionResumptionCapacityStep2(options.nodeid, TEST_ENDPOINT_ID, options.deviceAddress,
TEST_SSH_PORT, options.remoteServerApp, options.subscriptionCapacity)),
"Failed on testing subscription resumption capacity")

timeoutTicker.stop()
Expand Down
5 changes: 3 additions & 2 deletions src/controller/python/test/test_scripts/subscription_resumption_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

# Commissioning test.

import asyncio
import os
import sys
from optparse import OptionParser
Expand Down Expand Up @@ -115,8 +116,8 @@ def main():
"Failed on on-network commissioing")

FailIfNot(
test.TestSubscriptionResumption(options.nodeid, TEST_ENDPOINT_ID, options.deviceAddress,
TEST_SSH_PORT, options.remoteServerApp), "Failed to resume subscription")
asyncio.run(test.TestSubscriptionResumption(options.nodeid, TEST_ENDPOINT_ID, options.deviceAddress,
TEST_SSH_PORT, options.remoteServerApp)), "Failed to resume subscription")

timeoutTicker.stop()

Expand Down
10 changes: 7 additions & 3 deletions src/controller/python/test/test_scripts/subscription_resumption_timeout_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,13 @@

# Commissioning test.

import asyncio
import os
import sys
from optparse import OptionParser

from base import BaseTestHelper, FailIfNot, TestFail, TestTimeout, logger
from chip import clusters as Clusters

TEST_DISCRIMINATOR = 3840
TEST_SETUPPIN = 20202021
Expand Down Expand Up @@ -101,10 +103,12 @@ def main():

FailIfNot(
test.TestOnNetworkCommissioning(options.discriminator, options.setuppin, options.nodeid, options.deviceAddress),
"Failed on on-network commissioing")
"Failed on on-network commissioning")

try:
test.devCtrl.ZCLSubscribeAttribute("BasicInformation", "NodeLabel", options.nodeid, TEST_ENDPOINT_ID, 1, 2,
keepSubscriptions=True, autoResubscribe=False)
asyncio.run(test.devCtrl.ReadAttribute(options.nodeid,
[(TEST_ENDPOINT_ID, Clusters.BasicInformation.Attributes.NodeLabel)],
None, False, reportInterval=(1, 2), keepSubscriptions=True, autoResubscribe=False))
except Exception as ex:
TestFail(f"Failed to subscribe attribute: {ex}")

Expand Down
Loading