Fix failing tests

Signed-off-by: Sathvik K Gatti <[email protected]>
Signed-off-by: Suyambulingam Rathinasamy Muthupandi <[email protected]>
Signed-off-by: Charles Kim <[email protected]>

Author: s-gatti

test_collections/matter/sdk_tests/support/tests/yaml_tests/test_yaml_parser.py

@@ -103,12 +103,12 @@ def test_test_type_all_disabled_steps() -> None:
     disabled_step = MatterTestStep(label="Disabled Test Step", disabled=True)
     five_disabled_steps_test = yaml_test_instance(tests=[disabled_step] * 5)
 
-    type = _test_type(five_disabled_steps_test)
+    type, _ = _test_type(five_disabled_steps_test)
     assert type == MatterTestType.MANUAL
 
     # simulated in path overrides test type to simulated
     five_disabled_steps_test.path = Path("TC_XX_Simulated.yaml")
-    type = _test_type(five_disabled_steps_test)
+    type, _ = _test_type(five_disabled_steps_test)
     assert type == MatterTestType.SIMULATED
 
 
@@ -117,25 +117,25 @@ def test_test_type_some_disabled_steps() -> None:
     enabled_step = MatterTestStep(label="Enabled Test Step", disabled=False)
     test = yaml_test_instance(tests=[disabled_step, enabled_step])
 
-    type = _test_type(test)
+    type, _ = _test_type(test)
     assert type == MatterTestType.AUTOMATED
 
     # simulated in path overrides test type to simulated
     test.path = Path("TC_XX_Simulated.yaml")
-    type = _test_type(test)
+    type, _ = _test_type(test)
     assert type == MatterTestType.SIMULATED
 
 
 def test_test_type_all_enabled_steps_no_prompts() -> None:
     enabled_step = MatterTestStep(label="Enabled Test Step")
     five_enabled_steps_test = yaml_test_instance(tests=[enabled_step] * 5)
 
-    type = _test_type(five_enabled_steps_test)
+    type, _ = _test_type(five_enabled_steps_test)
     assert type == MatterTestType.AUTOMATED
 
     # simulated in path overrides test type to simulated
     five_enabled_steps_test.path = Path("TC_XX_Simulated.yaml")
-    type = _test_type(five_enabled_steps_test)
+    type, _ = _test_type(five_enabled_steps_test)
     assert type == MatterTestType.SIMULATED
 
 
@@ -144,10 +144,10 @@ def test_test_type_all_enabled_steps_some_prompts() -> None:
     prompt_step = MatterTestStep(label="Prompt Test Step", command="UserPrompt")
     test = yaml_test_instance(tests=[enabled_step, prompt_step])
 
-    type = _test_type(test)
+    type, _ = _test_type(test)
     assert type == MatterTestType.SEMI_AUTOMATED
 
     # simulated in path overrides test type to simulated
     test.path = Path("TC_XX_Simulated.yaml")
-    type = _test_type(test)
+    type, _ = _test_type(test)
     assert type == MatterTestType.SIMULATED

test_collections/matter/sdk_tests/support/yaml_tests/models/yaml_test_parser.py

@@ -28,8 +28,8 @@ class YamlParserException(Exception):
     """Raised when an error occurs during the parser of yaml file."""
 
 
-def _get_types(test: YamlTest) -> tuple[MatterTestType, SuiteType]:
-    """Determine the type of a test based on the parsed yaml.
+def _test_type(test: YamlTest) -> tuple[MatterTestType, SuiteType]:
+    """Determine the type of a test and test suite based on the parsed yaml.
 
     This is mainly determined by the number of disabled test steps.
 
@@ -89,7 +89,7 @@ def parse_yaml_test(path: Path) -> YamlTest:
             yaml_str = file.read()
             test = YamlTest.parse_raw(yaml_str, proto="yaml")
             test.path = path
-            test_type, suite_type = _get_types(test)
+            test_type, suite_type = _test_type(test)
             test.type = test_type
             test.suite_type = suite_type
         except ValidationError as e: