diff --git a/src/python_testing/TC_RVCCLEANM_2_1.py b/src/python_testing/TC_RVCCLEANM_2_1.py index 1a4bb5fa8b9d5e..65da44d7952162 100644 --- a/src/python_testing/TC_RVCCLEANM_2_1.py +++ b/src/python_testing/TC_RVCCLEANM_2_1.py @@ -22,8 +22,6 @@ from matter_testing_support import MatterBaseTest, async_test_body, default_matter_test_main, type_matches from mobly import asserts -wait_time = 0.5 - # This test requires several additional command line arguments # run with @@ -96,7 +94,6 @@ async def test_TC_RVCCLEANM_2_1(self): # Ensure that the device is in the correct state if self.is_ci: self.write_to_app_pipe('{"Name": "Reset"}') - sleep(wait_time) self.print_step(2, "Read SupportedModes attribute") supported_modes = await self.read_mod_attribute_expect_success(endpoint=self.endpoint, attribute=attributes.SupportedModes) diff --git a/src/python_testing/TC_RVCCLEANM_2_2.py b/src/python_testing/TC_RVCCLEANM_2_2.py index 919d625d3e4465..93bc84ed127291 100644 --- a/src/python_testing/TC_RVCCLEANM_2_2.py +++ b/src/python_testing/TC_RVCCLEANM_2_2.py @@ -21,8 +21,6 @@ from matter_testing_support import MatterBaseTest, async_test_body, default_matter_test_main from mobly import asserts -wait_time = 0.5 - class TC_RVCCLEANM_2_2(MatterBaseTest): @@ -94,13 +92,11 @@ async def test_TC_RVCCLEANM_2_2(self): # Ensure that the device is in the correct state if self.is_ci: self.write_to_app_pipe('{"Name": "Reset"}') - sleep(wait_time) self.print_step( 2, "Manually put the device in a state in which the RVC Run Mode cluster’s CurrentMode attribute is set to a mode without the Idle mode tag.") if self.is_ci: await self.send_run_change_to_mode_cmd(1) - sleep(wait_time) else: input("Press Enter when done.\n") diff --git a/src/python_testing/TC_RVCOPSTATE_2_1.py b/src/python_testing/TC_RVCOPSTATE_2_1.py index 6d7c5622275aaf..d1c648fe4d92ee 100644 --- a/src/python_testing/TC_RVCOPSTATE_2_1.py +++ b/src/python_testing/TC_RVCOPSTATE_2_1.py @@ -23,8 +23,6 @@ from matter_testing_support import MatterBaseTest, async_test_body, default_matter_test_main from mobly import asserts -wait_time = 0.5 - class TC_RVCOPSTATE_2_1(MatterBaseTest): def __init__(self, *args): @@ -88,7 +86,6 @@ async def test_TC_RVCOPSTATE_2_1(self): # Ensure that the device is in the correct state if self.is_ci: self.write_to_app_pipe('{"Name": "Reset"}') - sleep(wait_time) if self.check_pics("RVCOPSTATE.S.A0000"): self.print_step(2, "Read PhaseList attribute") @@ -166,7 +163,6 @@ async def test_TC_RVCOPSTATE_2_1(self): self.print_step("6c", "Manually put the device in the running state") if self.is_ci: await self.send_run_change_to_mode_cmd(1) - sleep(wait_time) else: input("Press Enter when done.\n") await self.read_and_validate_opstate(step="6d", expected_state=Clusters.OperationalState.Enums.OperationalStateEnum.kRunning) @@ -174,7 +170,6 @@ async def test_TC_RVCOPSTATE_2_1(self): self.print_step("6e", "Manually put the device in the paused state") if self.is_ci: await self.send_pause_cmd() - sleep(wait_time) else: input("Press Enter when done.\n") await self.read_and_validate_opstate(step="6f", expected_state=Clusters.OperationalState.Enums.OperationalStateEnum.kPaused) @@ -182,7 +177,6 @@ async def test_TC_RVCOPSTATE_2_1(self): self.print_step("6g", "Manually put the device in the error state") if self.is_ci: self.write_to_app_pipe('{"Name": "ErrorEvent", "Error": "UnableToStartOrResume"}') - sleep(wait_time) else: input("Press Enter when done.\n") await self.read_and_validate_opstate(step="6h", expected_state=Clusters.OperationalState.Enums.OperationalStateEnum.kError) @@ -190,11 +184,8 @@ async def test_TC_RVCOPSTATE_2_1(self): self.print_step("6i", "Manually put the device in the seeking charger state") if self.is_ci: self.write_to_app_pipe('{"Name": "Reset"}') - sleep(wait_time) await self.send_run_change_to_mode_cmd(1) - sleep(wait_time) await self.send_run_change_to_mode_cmd(0) - sleep(wait_time) else: input("Press Enter when done.\n") await self.read_and_validate_opstate(step="6j", expected_state=Clusters.RvcOperationalState.Enums.OperationalStateEnum.kSeekingCharger) @@ -202,7 +193,6 @@ async def test_TC_RVCOPSTATE_2_1(self): self.print_step("6k", "Manually put the device in the charging state") if self.is_ci: self.write_to_app_pipe('{"Name": "ChargerFound"}') - sleep(wait_time) else: input("Press Enter when done.\n") await self.read_and_validate_opstate(step="6l", expected_state=Clusters.RvcOperationalState.Enums.OperationalStateEnum.kCharging) @@ -210,7 +200,6 @@ async def test_TC_RVCOPSTATE_2_1(self): self.print_step("6m", "Manually put the device in the docked state") if self.is_ci: self.write_to_app_pipe('{"Name": "Charged"}') - sleep(wait_time) else: input("Press Enter when done.\n") await self.read_and_validate_opstate(step="6n", expected_state=Clusters.RvcOperationalState.Enums.OperationalStateEnum.kDocked) @@ -242,7 +231,6 @@ async def test_TC_RVCOPSTATE_2_1(self): self.print_step("7c", "Manually put the device in the unable to start or resume error state") if self.is_ci: self.write_to_app_pipe('{"Name": "ErrorEvent", "Error": "UnableToStartOrResume"}') - sleep(wait_time) else: input("Press Enter when done.\n") await self.read_and_validate_operror(step="7d", expected_error=Clusters.OperationalState.Enums.ErrorStateEnum.kUnableToStartOrResume) @@ -250,7 +238,6 @@ async def test_TC_RVCOPSTATE_2_1(self): self.print_step("7e", "Manually put the device in the unable to complete operation error state") if self.is_ci: self.write_to_app_pipe('{"Name": "ErrorEvent", "Error": "UnableToCompleteOperation"}') - sleep(wait_time) else: input("Press Enter when done.\n") await self.read_and_validate_operror(step="7f", expected_error=Clusters.OperationalState.Enums.ErrorStateEnum.kUnableToCompleteOperation) @@ -258,7 +245,6 @@ async def test_TC_RVCOPSTATE_2_1(self): self.print_step("7g", "Manually put the device in the command invalid error state") if self.is_ci: self.write_to_app_pipe('{"Name": "ErrorEvent", "Error": "CommandInvalidInState"}') - sleep(wait_time) else: input("Press Enter when done.\n") await self.read_and_validate_operror(step="7h", expected_error=Clusters.OperationalState.Enums.ErrorStateEnum.kCommandInvalidInState) @@ -266,7 +252,6 @@ async def test_TC_RVCOPSTATE_2_1(self): self.print_step("7i", "Manually put the device in the failed to find dock error state") if self.is_ci: self.write_to_app_pipe('{"Name": "ErrorEvent", "Error": "FailedToFindChargingDock"}') - sleep(wait_time) else: input("Press Enter when done.\n") await self.read_and_validate_operror(step="7j", expected_error=Clusters.RvcOperationalState.Enums.ErrorStateEnum.kFailedToFindChargingDock) @@ -274,7 +259,6 @@ async def test_TC_RVCOPSTATE_2_1(self): self.print_step("7k", "Manually put the device in the stuck error state") if self.is_ci: self.write_to_app_pipe('{"Name": "ErrorEvent", "Error": "Stuck"}') - sleep(wait_time) else: input("Press Enter when done.\n") await self.read_and_validate_operror(step="7l", expected_error=Clusters.RvcOperationalState.Enums.ErrorStateEnum.kStuck) @@ -282,7 +266,6 @@ async def test_TC_RVCOPSTATE_2_1(self): self.print_step("7m", "Manually put the device in the dust bin missing error state") if self.is_ci: self.write_to_app_pipe('{"Name": "ErrorEvent", "Error": "DustBinMissing"}') - sleep(wait_time) else: input("Press Enter when done.\n") await self.read_and_validate_operror(step="7n", expected_error=Clusters.RvcOperationalState.Enums.ErrorStateEnum.kDustBinMissing) @@ -290,7 +273,6 @@ async def test_TC_RVCOPSTATE_2_1(self): self.print_step("7o", "Manually put the device in the dust bin full error state") if self.is_ci: self.write_to_app_pipe('{"Name": "ErrorEvent", "Error": "DustBinFull"}') - sleep(wait_time) else: input("Press Enter when done.\n") await self.read_and_validate_operror(step="7p", expected_error=Clusters.RvcOperationalState.Enums.ErrorStateEnum.kDustBinFull) @@ -298,7 +280,6 @@ async def test_TC_RVCOPSTATE_2_1(self): self.print_step("7q", "Manually put the device in the water tank empty error state") if self.is_ci: self.write_to_app_pipe('{"Name": "ErrorEvent", "Error": "WaterTankEmpty"}') - sleep(wait_time) else: input("Press Enter when done.\n") await self.read_and_validate_operror(step="7r", expected_error=Clusters.RvcOperationalState.Enums.ErrorStateEnum.kWaterTankEmpty) @@ -306,7 +287,6 @@ async def test_TC_RVCOPSTATE_2_1(self): self.print_step("7s", "Manually put the device in the water tank missing error state") if self.is_ci: self.write_to_app_pipe('{"Name": "ErrorEvent", "Error": "WaterTankMissing"}') - sleep(wait_time) else: input("Press Enter when done.\n") await self.read_and_validate_operror(step="7t", expected_error=Clusters.RvcOperationalState.Enums.ErrorStateEnum.kWaterTankMissing) @@ -314,7 +294,6 @@ async def test_TC_RVCOPSTATE_2_1(self): self.print_step("7u", "Manually put the device in the water tank lid open error state") if self.is_ci: self.write_to_app_pipe('{"Name": "ErrorEvent", "Error": "WaterTankLidOpen"}') - sleep(wait_time) else: input("Press Enter when done.\n") await self.read_and_validate_operror(step="7v", expected_error=Clusters.RvcOperationalState.Enums.ErrorStateEnum.kWaterTankLidOpen) @@ -322,7 +301,6 @@ async def test_TC_RVCOPSTATE_2_1(self): self.print_step("7w", "Manually put the device in the mop cleaning pad missing error state") if self.is_ci: self.write_to_app_pipe('{"Name": "ErrorEvent", "Error": "MopCleaningPadMissing"}') - sleep(wait_time) else: input("Press Enter when done.\n") await self.read_and_validate_operror(step="7x", expected_error=Clusters.RvcOperationalState.Enums.ErrorStateEnum.kMopCleaningPadMissing) diff --git a/src/python_testing/TC_RVCOPSTATE_2_3.py b/src/python_testing/TC_RVCOPSTATE_2_3.py index 2be76de38d95a0..4d275ac5adc5b9 100644 --- a/src/python_testing/TC_RVCOPSTATE_2_3.py +++ b/src/python_testing/TC_RVCOPSTATE_2_3.py @@ -23,8 +23,6 @@ from matter_testing_support import MatterBaseTest, async_test_body, default_matter_test_main, type_matches from mobly import asserts -wait_time = 0.5 - # Takes an OpState or RvcOpState state enum and returns a string representation def state_enum_to_text(state_enum): @@ -170,12 +168,10 @@ async def test_TC_RVCOPSTATE_2_3(self): # Ensure that the device is in the correct state if self.is_ci: self.write_to_app_pipe('{"Name": "Reset"}') - sleep(wait_time) self.print_step(2, "Manually put the device in a state where it can receive a Pause command") if self.is_ci: await self.send_run_change_to_mode_cmd(1) - sleep(wait_time) else: input("Press Enter when done.\n") @@ -257,7 +253,6 @@ async def test_TC_RVCOPSTATE_2_3(self): self.print_step(24, "Manually put the device in the Stopped(0x00) operational state") if self.is_ci: self.write_to_app_pipe('{"Name": "Reset"}') - sleep(wait_time) else: input("Press Enter when done.\n") @@ -271,7 +266,6 @@ async def test_TC_RVCOPSTATE_2_3(self): self.print_step(28, "Manually put the device in the Error(0x03) operational state") if self.is_ci: self.write_to_app_pipe('{"Name": "ErrorEvent", "Error": "Stuck"}') - sleep(wait_time) else: input("Press Enter when done.\n") @@ -285,13 +279,9 @@ async def test_TC_RVCOPSTATE_2_3(self): self.print_step(32, "Manually put the device in the Charging(0x41) operational state") if self.is_ci: self.write_to_app_pipe('{"Name": "Reset"}') - sleep(wait_time) await self.send_run_change_to_mode_cmd(1) - sleep(wait_time) await self.send_run_change_to_mode_cmd(0) - sleep(wait_time) self.write_to_app_pipe('{"Name": "ChargerFound"}') - sleep(wait_time) else: input("Press Enter when done.\n") @@ -312,7 +302,6 @@ async def test_TC_RVCOPSTATE_2_3(self): self.print_step(38, "Manually put the device in the Docked(0x42) operational state") if self.is_ci: self.write_to_app_pipe('{"Name": "Charged"}') - sleep(wait_time) else: input("Press Enter when done.\n") @@ -331,9 +320,7 @@ async def test_TC_RVCOPSTATE_2_3(self): self.print_step(43, "Manually put the device in the SeekingCharger(0x40) operational state") if self.is_ci: await self.send_run_change_to_mode_cmd(1) - sleep(wait_time) await self.send_run_change_to_mode_cmd(0) - sleep(wait_time) else: input("Press Enter when done.\n") diff --git a/src/python_testing/TC_RVCRUNM_2_1.py b/src/python_testing/TC_RVCRUNM_2_1.py index 262a62021f1de1..4c1bb579dd7061 100644 --- a/src/python_testing/TC_RVCRUNM_2_1.py +++ b/src/python_testing/TC_RVCRUNM_2_1.py @@ -22,8 +22,6 @@ from matter_testing_support import MatterBaseTest, async_test_body, default_matter_test_main, type_matches from mobly import asserts -wait_time = 0.5 - # This test requires several additional command line arguments # run with @@ -91,7 +89,6 @@ async def test_TC_RVCRUNM_2_1(self): # Ensure that the device is in the correct state if self.is_ci: self.write_to_app_pipe('{"Name": "Reset"}') - sleep(wait_time) self.print_step(2, "Read SupportedModes attribute") supported_modes = await self.read_mod_attribute_expect_success(endpoint=self.endpoint, attribute=attributes.SupportedModes) diff --git a/src/python_testing/TC_RVCRUNM_2_2.py b/src/python_testing/TC_RVCRUNM_2_2.py index 54b26a14ad6d94..c0fc20215e72f2 100644 --- a/src/python_testing/TC_RVCRUNM_2_2.py +++ b/src/python_testing/TC_RVCRUNM_2_2.py @@ -21,8 +21,6 @@ from matter_testing_support import MatterBaseTest, async_test_body, default_matter_test_main from mobly import asserts -wait_time = 0.5 - # This test requires several additional command line arguments. # Run the test with # --int-arg PIXIT.RVCRUNM.MODE_A: PIXIT.RVCRUNM.MODE_B: @@ -128,7 +126,6 @@ async def test_TC_RVCRUNM_2_2(self): # Ensure that the device is in the correct state if self.is_ci: self.write_to_app_pipe('{"Name": "Reset"}') - sleep(wait_time) self.print_step(2, "Manually put the device in a RVC Run Mode cluster mode with " "the Idle(0x4000) mode tag and in a device state that allows changing to either "