Reverted changes to self.is_ci check:

- Reverted the changes done to the self.is_ci if check block that was made as it was not passing through CI/CD tests.
project-chip · Jul 4, 2024 · a9b96f7 · a9b96f7
1 parent f871894
commit a9b96f7
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 17 deletions.
diff --git a/src/python_testing/TC_RVCCLEANM_2_1.py b/src/python_testing/TC_RVCCLEANM_2_1.py
@@ -84,10 +84,12 @@ async def test_TC_RVCCLEANM_2_1(self):
         self.endpoint = self.matter_test_config.endpoint
         self.mode_ok = self.matter_test_config.global_test_params['PIXIT.RVCCLEANM.MODE_CHANGE_OK']
         self.mode_fail = self.matter_test_config.global_test_params['PIXIT.RVCCLEANM.MODE_CHANGE_FAIL']
-        app_pid = self.matter_test_config.app_pid
-        if app_pid != 0:
-            self.is_ci = True
-            self.app_pipe = self.app_pipe + str(app_pid)
+        self.is_ci = self.check_pics("PICS_SDK_CI_ONLY")
+        if self.is_ci:
+            app_pid = self.matter_test_config.app_pid
+            if app_pid != 0:
+                self.is_ci = True
+                self.app_pipe = self.app_pipe + str(app_pid)
 
         RVCClean_cluster = Clusters.RvcCleanMode
 

diff --git a/src/python_testing/TC_RVCCLEANM_2_2.py b/src/python_testing/TC_RVCCLEANM_2_2.py
@@ -86,10 +86,12 @@ def write_to_app_pipe(self, command):
     @async_test_body
     async def test_TC_RVCCLEANM_2_2(self):
         self.endpoint = self.matter_test_config.endpoint
-        app_pid = self.matter_test_config.app_pid
-        if app_pid != 0:
-            self.is_ci = True
-            self.app_pipe = self.app_pipe + str(app_pid)
+        self.is_ci = self.check_pics("PICS_SDK_CI_ONLY")
+        if self.is_ci:
+            app_pid = self.matter_test_config.app_pid
+            if app_pid != 0:
+                self.is_ci = True
+                self.app_pipe = self.app_pipe + str(app_pid)
 
         # replaces the RVCRUNM attributes from PICS file
         RVCRun_cluster = Clusters.RvcRunMode

diff --git a/src/python_testing/TC_RVCRUNM_2_1.py b/src/python_testing/TC_RVCRUNM_2_1.py
@@ -79,6 +79,12 @@ async def test_TC_RVCRUNM_2_1(self):
         self.endpoint = self.matter_test_config.endpoint
         self.mode_ok = self.matter_test_config.global_test_params['PIXIT.RVCRUNM.MODE_CHANGE_OK']
         self.mode_fail = self.matter_test_config.global_test_params['PIXIT.RVCRUNM.MODE_CHANGE_FAIL']
+        self.is_ci = self.check_pics("PICS_SDK_CI_ONLY")
+        if self.is_ci:
+            app_pid = self.matter_test_config.app_pid
+            if app_pid != 0:
+                self.is_ci = True
+                self.app_pipe = self.app_pipe + str(app_pid)
 
         RVCRun_cluster = Clusters.RvcRunMode
 

diff --git a/src/python_testing/TC_RVCRUNM_2_2.py b/src/python_testing/TC_RVCRUNM_2_2.py
@@ -120,15 +120,12 @@ async def test_TC_RVCRUNM_2_2(self):
         self.endpoint = self.matter_test_config.endpoint
         self.mode_a = self.matter_test_config.global_test_params['PIXIT.RVCRUNM.MODE_A']
         self.mode_b = self.matter_test_config.global_test_params['PIXIT.RVCRUNM.MODE_B']
-        app_pid = self.matter_test_config.app_pid
-        if app_pid != 0:
-            self.is_ci = True
-            self.app_pipe = self.app_pipe + str(app_pid)
-
-        app_pid = self.matter_test_config.app_pid
-        if app_pid != 0:
-            self.is_ci = True
-            self.app_pipe = self.app_pipe + str(app_pid)
+        self.is_ci = self.check_pics("PICS_SDK_CI_ONLY")
+        if self.is_ci:
+            app_pid = self.matter_test_config.app_pid
+            if app_pid != 0:
+                self.is_ci = True
+                self.app_pipe = self.app_pipe + str(app_pid)
 
         RVCRun_cluster = Clusters.RvcRunMode