Fix hardcoded paths in TestTimeSyncTrustedtimeSourceRunner.py

project-chip · Sep 4, 2024 · a93f077 · a93f077
1 parent 9805dde
commit a93f077
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 19 deletions.
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -522,7 +522,7 @@ jobs:
                   mkdir -p out/trace_data
                   scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/controller/python/test/test_scripts/mobile-device-test.py'
                   scripts/run_in_python_env.sh out/venv 'python3 ./src/python_testing/execute_python_tests.py --env-file /tmp/test_env.yaml --search-directory src/python_testing'
-                  scripts/run_in_python_env.sh out/venv './scripts/tests/TestTimeSyncTrustedTimeSourceRunner.py'
+                  scripts/run_in_python_env.sh out/venv './scripts/tests/TestTimeSyncTrustedTimeSourceRunner.py --all-clusters out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app'
                   scripts/run_in_python_env.sh out/venv './src/python_testing/test_testing/test_TC_ICDM_2_1.py'
                   scripts/run_in_python_env.sh out/venv 'python3 ./src/python_testing/TestIdChecks.py'
                   scripts/run_in_python_env.sh out/venv 'python3 ./src/python_testing/TestSpecParsingDeviceType.py'

diff --git a/scripts/tests/TestTimeSyncTrustedTimeSourceRunner.py b/scripts/tests/TestTimeSyncTrustedTimeSourceRunner.py
@@ -14,37 +14,40 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import argparse
 import logging
 import os
 import signal
 import subprocess
 import sys
 import time
 
-DEFAULT_CHIP_ROOT = os.path.abspath(
-    os.path.join(os.path.dirname(__file__), '..', '..'))
+DEFAULT_CHIP_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..'))
+
+DEFAULT_ALL_CLUSTERS = os.path.join(
+    DEFAULT_CHIP_ROOT,
+    'out',
+    'linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test',
+    'chip-all-clusters-app')
+DEFAULT_TEST_RUNNER = os.path.join(DEFAULT_CHIP_ROOT, 'scripts', 'tests', 'run_python_test.py')
+DEFAULT_TEST_SCRIPT = os.path.join(DEFAULT_CHIP_ROOT, 'src', 'python_testing', 'TestTimeSyncTrustedTimeSource.py')
 
 
 class TestDriver:
-    def __init__(self):
-        self.app_path = os.path.abspath(os.path.join(DEFAULT_CHIP_ROOT, 'out',
-                                                     'linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test', 'chip-all-clusters-app'))
-        self.run_python_test_path = os.path.abspath(os.path.join(os.path.dirname(__file__), 'run_python_test.py'))
+    def __init__(self, all_clusters: str, test_runner: str, test_script: str):
+        self.app_path = all_clusters
+        self.run_python_test_path = test_runner
+        self.script_path = test_script
 
-        self.script_path = os.path.abspath(os.path.join(
-            DEFAULT_CHIP_ROOT, 'src', 'python_testing', 'TestTimeSyncTrustedTimeSource.py'))
         if not os.path.exists(self.app_path):
-            msg = 'chip-all-clusters-app not found'
-            logging.error(msg)
-            raise FileNotFoundError(msg)
+            logging.error('%s not found', self.app_path)
+            raise FileNotFoundError(self.app_path)
         if not os.path.exists(self.run_python_test_path):
-            msg = 'run_python_test.py script not found'
-            logging.error(msg)
-            raise FileNotFoundError(msg)
+            logging.error('%s not found', self.run_python_test_path)
+            raise FileNotFoundError(self.run_python_test_path)
         if not os.path.exists(self.script_path):
-            msg = 'TestTimeSyncTrustedTimeSource.py script not found'
-            logging.error(msg)
-            raise FileNotFoundError(msg)
+            logging.error('%s not found', self.script_path)
+            raise FileNotFoundError(self.script_path)
 
     def get_base_run_python_cmd(self, run_python_test_path, app_path, app_args, script_path, script_args):
         return f'{str(run_python_test_path)} --app {str(app_path)} --app-args "{app_args}" --script {str(script_path)} --script-args "{script_args}"'
@@ -78,7 +81,17 @@ def main():
     base_script_args = '--storage-path admin_storage.json --discriminator 1234 --passcode 20202021'
     script_args = base_script_args + ' --commissioning-method on-network --commission-only'
 
-    driver = TestDriver()
+    parser = argparse.ArgumentParser('TimeSyncTrustedTimeSource runner', formatter_class=argparse.ArgumentDefaultsHelpFormatter)
+    parser.add_argument('--all-clusters', default=DEFAULT_ALL_CLUSTERS, help="All clusters application.")
+    parser.add_argument('--test-runner', default=DEFAULT_TEST_RUNNER, help="the run_python_test.py script.")
+    parser.add_argument('--test-script', default=DEFAULT_TEST_SCRIPT, help="The path to the TimeSyncTrustedTimeSource test.")
+    args = parser.parse_args()
+
+    driver = TestDriver(
+        all_clusters=args.app_clusters,
+        test_runner=args.test_runner,
+        test_script=args.test_script,
+    )
     ret = driver.run_test_section(app_args, script_args, factory_reset_all=True)
     if ret != 0:
         return ret