Skip to content

Commit

Permalink
Fix test app path in cirque test. (#32501)
Browse files Browse the repository at this point in the history
* Switch subscription resumption test app to lit-icd-app

* review changes
  • Loading branch information
wqx6 authored and pull[bot] committed May 9, 2024
1 parent 4258249 commit 1181810
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ def run(self):
try:
client.connect(self.remote_ip, self.ssh_port, self.user, self.password)
client.exec_command(
("kill \"$(ps aux | grep -E \'out/debug/standalone/{}\' | grep -v grep | grep -v gdb | "
("kill \"$(ps aux | grep -E \'out/debug/{}\' | grep -v grep | grep -v gdb | "
"awk \'{{print $2}}\')\"").format(self.remote_server_app))
time.sleep(1)
stdin, stdout, stderr = client.exec_command(
Expand All @@ -75,7 +75,7 @@ def run(self):
restart_remote_device_command = (
"CHIPCirqueDaemon.py -- run gdb -batch -return-child-result -q -ex \"set pagination off\" "
"-ex run -ex \"thread apply all bt\" --args {} {}").format(
os.path.join(CHIP_REPO, "out/debug/standalone", self.remote_server_app), self.extra_args)
os.path.join(CHIP_REPO, "out/debug", self.remote_server_app), self.extra_args)
client.exec_command(restart_remote_device_command)

finally:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
TEST_EXTPANID = "fedcba9876543210"
TEST_DISCRIMINATOR = 3840
MATTER_DEVELOPMENT_PAA_ROOT_CERTS = "credentials/development/paa-root-certs"
TEST_END_DEVICE_APP = "chip-all-clusters-app"
TEST_END_DEVICE_APP = "standalone/chip-all-clusters-app"
TEST_SUBSCRIPTION_CAPACITY = 3


Expand Down Expand Up @@ -119,7 +119,7 @@ def run_subscription_resumption_capacity_test(self):
("CHIPCirqueDaemon.py -- run gdb -batch -return-child-result -q -ex \"set pagination off\" "
"-ex run -ex \"thread apply all bt\" --args {} --thread --discriminator {} "
"--subscription-capacity {}").format(
os.path.join(CHIP_REPO, "out/debug/standalone", TEST_END_DEVICE_APP), TEST_DISCRIMINATOR,
os.path.join(CHIP_REPO, "out/debug", TEST_END_DEVICE_APP), TEST_DISCRIMINATOR,
TEST_SUBSCRIPTION_CAPACITY))

self.reset_thread_devices(server_ids)
Expand Down
4 changes: 2 additions & 2 deletions src/test_driver/linux-cirque/SubscriptionResumptionTest.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
TEST_EXTPANID = "fedcba9876543210"
TEST_DISCRIMINATOR = 3840
MATTER_DEVELOPMENT_PAA_ROOT_CERTS = "credentials/development/paa-root-certs"
TEST_END_DEVICE_APP = "chip-all-clusters-app"
TEST_END_DEVICE_APP = "standalone/chip-all-clusters-app"

DEVICE_CONFIG = {
'device0': {
Expand Down Expand Up @@ -96,7 +96,7 @@ def run_subscription_resumption_test(self):
server_device_id,
("CHIPCirqueDaemon.py -- run gdb -batch -return-child-result -q -ex \"set pagination off\" "
"-ex run -ex \"thread apply all bt\" --args {} --thread --discriminator {}").format(
os.path.join(CHIP_REPO, "out/debug/standalone", TEST_END_DEVICE_APP), TEST_DISCRIMINATOR))
os.path.join(CHIP_REPO, "out/debug", TEST_END_DEVICE_APP), TEST_DISCRIMINATOR))

self.reset_thread_devices(server_ids)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
TEST_EXTPANID = "fedcba9876543210"
TEST_DISCRIMINATOR = 3840
MATTER_DEVELOPMENT_PAA_ROOT_CERTS = "credentials/development/paa-root-certs"
TEST_END_DEVICE_APP = "chip-all-clusters-app"
TEST_END_DEVICE_APP = "standalone/chip-all-clusters-app"

DEVICE_CONFIG = {
'device0': {
Expand Down Expand Up @@ -97,7 +97,7 @@ def run_subscription_resumption_timeout_test(self):
("CHIPCirqueDaemon.py -- run gdb -batch -return-child-result -q -ex \"set pagination off\" "
"-ex run -ex \"thread apply all bt\" --args {} --thread --discriminator {} "
"--subscription-resumption-retry-interval 5").format(
os.path.join(CHIP_REPO, "out/debug/standalone", TEST_END_DEVICE_APP), TEST_DISCRIMINATOR))
os.path.join(CHIP_REPO, "out/debug", TEST_END_DEVICE_APP), TEST_DISCRIMINATOR))

self.reset_thread_devices(server_ids)

Expand Down

0 comments on commit 1181810

Please sign in to comment.