From 3fce3bf82c7af0442a9a5dee33627dd28be51960 Mon Sep 17 00:00:00 2001 From: Terence Hampson Date: Thu, 2 Feb 2023 20:37:00 -0500 Subject: [PATCH] Fix minor issue with PICS test step check, and enable tests (#24832) --- scripts/tests/chiptest/__init__.py | 59 +++++-------------- .../yamltest_with_chip_repl_tester.py | 4 +- 2 files changed, 17 insertions(+), 46 deletions(-) diff --git a/scripts/tests/chiptest/__init__.py b/scripts/tests/chiptest/__init__.py index 08153207f1420e..aecdf0cf0336f2 100644 --- a/scripts/tests/chiptest/__init__.py +++ b/scripts/tests/chiptest/__init__.py @@ -59,50 +59,21 @@ def _GetManualTests() -> Set[ManualTest]: # for this reason are marked as manual". # # We are working to get this list down to 0. - manualtests.add(ManualTest(yaml="OTA_SuccessfulTransfer.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_ACE_1_1.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_ACE_1_5.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_ACL_2_10.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_ACL_2_7.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_ACL_2_8.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_ACL_2_9.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_APBSC_9_1.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_BINFO_2_1.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_CC_6_2.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_CC_6_3.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_CC_8_1.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_CGEN_2_1.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_CHANNEL_5_3.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_DGETH_2_1.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_DGETH_2_2.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_DGGEN_2_1.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_DGWIFI_2_1.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_DRLK_2_2.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_DRLK_2_3.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_DRLK_2_5.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_DRLK_2_7.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_LOWPOWER_2_1.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_LUNIT_3_1.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_MEDIAINPUT_3_12.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_MEDIAPLAYBACK_6_1.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_MEDIAPLAYBACK_6_2.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_MEDIAPLAYBACK_6_3.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_MEDIAPLAYBACK_6_4.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_PCC_2_1.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_PS_2_1.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_SC_5_1.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_SC_5_2.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_TSTAT_2_1.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_TSTAT_2_2.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_TSUIC_2_2.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_WAKEONLAN_4_1.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_WNCV_2_1.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="Test_TC_WNCV_2_5.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="TestClusterMultiFabric.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="TestCommissionerNodeId.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="TestEvents.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="TestGroupMessaging.yaml", reason="TODO")) - manualtests.add(ManualTest(yaml="TestMultiAdmin.yaml", reason="TODO")) + manualtests.add(ManualTest(yaml="Test_TC_ACL_2_10.yaml", reason="TODO Event Not Supported Yet")) + manualtests.add(ManualTest(yaml="Test_TC_ACL_2_7.yaml", reason="TODO Event Not Supported Yet")) + manualtests.add(ManualTest(yaml="Test_TC_ACL_2_8.yaml", reason="TODO Event Not Supported Yet")) + manualtests.add(ManualTest(yaml="Test_TC_ACL_2_9.yaml", reason="TODO Event Not Supported Yet")) + manualtests.add(ManualTest(yaml="TestEvents.yaml", reason="TODO Event Not Supported Yet")) + + manualtests.add(ManualTest(yaml="Test_TC_ACE_1_1.yaml", reason="TODO GetCommissionerNodeId Not Supported Yet")) + manualtests.add(ManualTest(yaml="Test_TC_ACE_1_5.yaml", reason="TODO GetCommissionerNodeId Not Supported Yet")) + manualtests.add(ManualTest(yaml="Test_TC_SC_5_1.yaml", reason="TODO GetCommissionerNodeId Not Supported Yet")) + manualtests.add(ManualTest(yaml="Test_TC_SC_5_2.yaml", reason="TODO GetCommissionerNodeId Not Supported Yet")) + manualtests.add(ManualTest(yaml="TestCommissionerNodeId.yaml", reason="TODO GetCommissionerNodeId Not Supported Yet")) + + manualtests.add(ManualTest(yaml="TestClusterMultiFabric.yaml", reason="TODO Enum Mismatch")) + manualtests.add(ManualTest(yaml="TestGroupMessaging.yaml", reason="TODO Group Message Not Supported in chip-repl yet")) + manualtests.add(ManualTest(yaml="TestMultiAdmin.yaml", reason="TODO chip-repl hangs on command expected to fail")) # Failing, unclear why. Likely repl specific, used to pass however first # failure point seems unrelated. Historically this seems (very?) flaky diff --git a/scripts/tests/chiptest/yamltest_with_chip_repl_tester.py b/scripts/tests/chiptest/yamltest_with_chip_repl_tester.py index f1d5583feb865c..fada763dc15466 100644 --- a/scripts/tests/chiptest/yamltest_with_chip_repl_tester.py +++ b/scripts/tests/chiptest/yamltest_with_chip_repl_tester.py @@ -106,13 +106,13 @@ def _StackShutDown(): # Executing and validating test for test_step in yaml.tests: + if not test_step.is_pics_enabled: + continue test_action = runner.encode(test_step) # TODO if test_action is None we should see if it is a pseudo cluster. if test_action is None: raise Exception( f'Failed to encode test step {test_step.label}') - if not test_action.pics_enabled: - continue response = runner.execute(test_action) decoded_response = runner.decode(response)