address review comments

Author: cecille

.github/workflows/tests.yaml

@@ -588,6 +588,8 @@ jobs:
                   scripts/run_in_python_env.sh out/venv 'python3 ./src/python_testing/TestConformanceSupport.py'
                   scripts/run_in_python_env.sh out/venv 'python3 ./src/python_testing/test_testing/test_IDM_10_4.py'
                   scripts/run_in_python_env.sh out/venv 'python3 ./src/python_testing/test_testing/test_TC_SC_7_1.py'
+                  scripts/run_in_python_env.sh out/venv 'python3 ./src/python_testing/test_testing/TestDecorators.py'
+
 
             - name: Uploading core files
               uses: actions/upload-artifact@v4

src/python_testing/matter_testing_support.py

@@ -1762,6 +1762,7 @@ def per_endpoint_runner(self: MatterBaseTest, *args, **kwargs):
             # Ditto for teardown - we want to tear down after each iteration, and we want to notify the hook that
             # the test iteration is stopped. test_stop is called by on_pass or on_fail during the last iteration or
             # on failure.
+            original_ep = self.matter_test_config.endpoint
             for e in endpoints:
                 logging.info(f'Running test on endpoint {e}')
                 if e != endpoints[0]:
@@ -1772,7 +1773,7 @@ def per_endpoint_runner(self: MatterBaseTest, *args, **kwargs):
                     self.teardown_test()
                     test_duration = (datetime.now(timezone.utc) - self.test_start_time) / timedelta(microseconds=1)
                     self.runner_hook.test_stop(exception=None, duration=test_duration)
-
+            self.matter_test_config.endpoint = original_ep
         return per_endpoint_runner
     return per_endpoint_test_internal
 

src/python_testing/test_testing/TestDecorators.py

@@ -159,6 +159,8 @@ async def test_endpoints(self):
     async def test_whole_node_with_pics(self):
         pass
 
+    # This method returns the top level pics for test_whole_node_with_pics
+    # It is used to test that test_whole_node_with_pics will fail since you can't have a whole node test gated on a PICS.
     def pics_whole_node_with_pics(self):
         return ['EXAMPLE.S']
 
@@ -167,6 +169,8 @@ def pics_whole_node_with_pics(self):
     async def test_per_endpoint_with_pics(self):
         pass
 
+    # This method returns the top level pics for test_per_endpoint_with_pics
+    # It is used to test that test_per_endpoint_with_pics will fail since you can't have a per endpoint test gated on a PICS.
     def pics_per_endpoint_with_pics(self):
         return ['EXAMPLE.S']
 
@@ -210,7 +214,19 @@ async def test_endpoint_boolean_yes(self):
     async def test_endpoint_boolean_no(self):
         pass
 
-    # TODO: add test for assertions on whole node, and on each endpoint of an endpoint test
+    @per_endpoint_test(has_cluster(Clusters.OnOff))
+    async def test_fail_on_ep0(self):
+        if self.matter_test_config.endpoint == 0:
+            asserts.fail("Expected failure")
+
+    @per_endpoint_test(has_cluster(Clusters.OnOff))
+    async def test_fail_on_ep1(self):
+        if self.matter_test_config.endpoint == 1:
+            asserts.fail("Expected failure")
+
+    @per_node_test
+    async def test_fail_on_whole_node(self):
+        asserts.fail("Expected failure")
 
 
 def main():
@@ -279,6 +295,34 @@ def check_skipped(test_name: str):
     check_once_per_endpoint('test_endpoint_boolean_yes')
     check_skipped('test_endpoint_boolean_no')
 
+    test_name = 'test_fail_on_ep0'
+    test_runner.set_test('TestDecorators.py', 'TestDecorators', test_name)
+    read_resp = get_clusters([0, 1])
+    ok = test_runner.run_test_with_mock_read(read_resp, hooks)
+    if ok:
+        failures.append(f"Did not get expected test assertion on {test_name}")
+
+    test_name = 'test_fail_on_ep1'
+    test_runner.set_test('TestDecorators.py', 'TestDecorators', test_name)
+    read_resp = get_clusters([0, 1])
+    ok = test_runner.run_test_with_mock_read(read_resp, hooks)
+    if ok:
+        failures.append(f"Did not get expected test assertion on {test_name}")
+
+    test_name = 'test_fail_on_ep1'
+    test_runner.set_test('TestDecorators.py', 'TestDecorators', test_name)
+    read_resp = get_clusters([0])
+    ok = test_runner.run_test_with_mock_read(read_resp, hooks)
+    if not ok:
+        failures.append(f"Unexpected failure on {test_name}")
+
+    test_name = 'test_fail_on_whole_node'
+    test_runner.set_test('TestDecorators.py', 'TestDecorators', test_name)
+    read_resp = get_clusters([0, 1])
+    ok = test_runner.run_test_with_mock_read(read_resp, hooks)
+    if ok:
+        failures.append(f"Did not get expected test assertion on {test_name}")
+
     test_runner.Shutdown()
     print(
         f"Test of Decorators: test response incorrect: {len(failures)}")