Python Script TC_RVCRUNM_2_2.py and TC_RVCCLEANM_2_2.py

* Updated TC_RVCRUNM_2_2.py and TC_RVCCLEANM_2_2.py as per comments from ROB

Author: Harshith-GRL

src/python_testing/TC_RVCCLEANM_2_2.py

@@ -106,7 +106,7 @@ def write_to_app_pipe(self, command):
     async def test_TC_RVCCLEANM_2_2(self):
         # TODO Replace 0x8000 with python object of RVCCLEAN FEATURE bit map when implemented
         # 0x8000 corresponds to 16 bit DIRECTMODECH Feature map
-        self.directmodech_bit_map = 0x8000
+        self.directmodech_bit_mask = 0x8000
         self.endpoint = self.matter_test_config.endpoint
         self.is_ci = self.check_pics("PICS_SDK_CI_ONLY")
         if self.is_ci:
@@ -175,21 +175,18 @@ async def test_TC_RVCCLEANM_2_2(self):
                 break
 
         self.print_step("7a", "Read FeatureMap Attribute")
-        directmodech = await self.read_feature_map_attribute()
-        directmode_enabled = directmodech & self.directmodech_bit_map
+        feature_map = await self.read_feature_map_attribute()
+        directmode_enabled = feature_map & self.directmodech_bit_mask
 
         self.print_step("7b", "Send ChangeToMode command")
+        response = await self.send_clean_change_to_mode_cmd(self.new_clean_mode_th)
+        asserts.assert_true(type_matches(response, Clusters.RvcCleanMode.Commands.ChangeToModeResponse),
+                            "The response should ChangeToModeResponse command")
         if directmode_enabled:
-            response = await self.send_clean_change_to_mode_cmd(self.new_clean_mode_th)
-            asserts.assert_true(type_matches(response, Clusters.RvcCleanMode.Commands.ChangeToModeResponse),
-                                "The response should ChangeToModeResponse command")
             asserts.assert_equal(response.status, RvcStatusEnum.Success,
                                  "The response should contain a ChangeToModeResponse command "
                                  "with the Status set to Success(0x0).")
         else:
-            response = await self.send_clean_change_to_mode_cmd(self.new_clean_mode_th)
-            asserts.assert_true(type_matches(response, Clusters.RvcCleanMode.Commands.ChangeToModeResponse),
-                                "The response should ChangeToModeResponse command")
             asserts.assert_equal(response.status, RvcStatusEnum.InvalidInMode,
                                  "The response should contain a ChangeToModeResponse command "
                                  "with the Status set to InvalidInMode(0x03).")

src/python_testing/TC_RVCRUNM_2_2.py

@@ -133,7 +133,7 @@ async def test_TC_RVCRUNM_2_2(self):
 
         # TODO Replace 0x8000 with python object of RVCRUN FEATURE bit when implemented
         # 0x8000 corresponds to 16 bit DIRECTMODECH Feature map
-        self.directmodech_bit_map = 0x8000
+        self.directmodech_bit_mask = 0x8000
         self.endpoint = self.matter_test_config.endpoint
         self.is_ci = self.check_pics("PICS_SDK_CI_ONLY")
         self.mode_a = self.matter_test_config.global_test_params['PIXIT.RVCRUNM.MODE_A']
@@ -210,9 +210,9 @@ async def test_TC_RVCRUNM_2_2(self):
         await self.read_current_mode_with_check(self.mode_a)
 
         self.print_step("6a", "Read Attribute FeatureMap")
-        directmodech = await self.read_mod_attribute_expect_success(cluster=Clusters.RvcRunMode,
+        feature_map = await self.read_mod_attribute_expect_success(cluster=Clusters.RvcRunMode,
                                                                     attribute=Clusters.RvcRunMode.Attributes.FeatureMap)
-        directmode_enabled = directmodech & self.directmodech_bit_map
+        directmode_enabled = feature_map & self.directmodech_bit_mask
 
         self.print_step('6b', "Send ChangeToMode MODE_B command")
         if directmode_enabled: