Rename scripts/tests/yaml to scripts/tests/chipyaml (project-chip#33913)

* rename scripts/tests/yaml to scripts/tests/chipyaml and replace the imports for yaml.paths_finder to chipyaml.paths_finder (and other occurences if they exist) * Adding more fixed references for renaming it to chipyaml
joonhaengHeo · Jun 15, 2024 · 7a6ea3e · 7a6ea3e
1 parent ec8547a
commit 7a6ea3e
Show file tree

Hide file tree

Showing 17 changed files with 12 additions and 12 deletions.
diff --git a/docs/guides/simulated_device_linux.md b/docs/guides/simulated_device_linux.md
@@ -61,7 +61,7 @@ Now that the building is completed there is a `chip-app1` binary created. This
 binary can be executed on a linux os with test commands.
 
 ```
-./scripts/tests/yaml/runner.py [TEST NAME] app1
+./scripts/tests/chipyaml/runner.py [TEST NAME] app1
 ```
 
 ## Interacting with the simulated app

diff --git a/docs/testing/yaml.md b/docs/testing/yaml.md
@@ -347,12 +347,12 @@ Compile chip-tool:
 
 NOTE: use the target appropriate to your system
 
-[chiptool.py](https://github.com/project-chip/connectedhomeip/blob/master/scripts/tests/yaml/chiptool.py)
+[chiptool.py](https://github.com/project-chip/connectedhomeip/blob/master/scripts/tests/chipyaml/chiptool.py)
 can be used to run tests against a commissioned DUT (commissioned by chip-tool).
 This will start an interactive instance of chip-tool automatically.
 
 ```
-./scripts/tests/yaml/chiptool.py tests Test_TC_OO_2_1 --server_path ./out/linux-x64-chip-tool/chip-tool
+./scripts/tests/chipyaml/chiptool.py tests Test_TC_OO_2_1 --server_path ./out/linux-x64-chip-tool/chip-tool
 
 ```
 
@@ -361,14 +361,14 @@ NOTE: substitute the appropriate test name and chip-tool path as appropriate.
 A list of available tests can be generated using:
 
 ```
-./scripts/tests/yaml/chiptool.py list
+./scripts/tests/chipyaml/chiptool.py list
 ```
 
 Config variables can be passed to chiptool.py after the script by separating
 with --
 
 ```
-./scripts/tests/yaml/chiptool.py tests Test_TC_OO_2_1 --server_path ./out/linux-x64-chip-tool/chip-tool -- nodeId 0x12344321
+./scripts/tests/chipyaml/chiptool.py tests Test_TC_OO_2_1 --server_path ./out/linux-x64-chip-tool/chip-tool -- nodeId 0x12344321
 
 ```
 

diff --git a/examples/rvc-app/run_all_yaml_tests.sh b/examples/rvc-app/run_all_yaml_tests.sh
@@ -16,11 +16,11 @@ if [ -z "$NODEID" ]; then
 fi
 
 # RVC Clean Mode cluster
-./scripts/tests/yaml/chiptool.py tests Test_TC_RVCCLEANM_1_1 --PICS "$RVC_DEVICE_PICS" --nodeId "$NODEID" --endpoint "$RVC_DEVICE_ENDPOINT" &&
+./scripts/tests/chipyaml/chiptool.py tests Test_TC_RVCCLEANM_1_1 --PICS "$RVC_DEVICE_PICS" --nodeId "$NODEID" --endpoint "$RVC_DEVICE_ENDPOINT" &&
 
  # RVC Operational State cluster
- ./scripts/tests/yaml/chiptool.py tests Test_TC_RVCOPSTATE_1_1 --PICS "$RVC_DEVICE_PICS" --nodeId "$NODEID" --endpoint "$RVC_DEVICE_ENDPOINT" &&
+ ./scripts/tests/chipyaml/chiptool.py tests Test_TC_RVCOPSTATE_1_1 --PICS "$RVC_DEVICE_PICS" --nodeId "$NODEID" --endpoint "$RVC_DEVICE_ENDPOINT" &&
 
  # RVC Run Mode cluster
- ./scripts/tests/yaml/chiptool.py tests Test_TC_RVCRUNM_1_1 --PICS "$RVC_DEVICE_PICS" --nodeId "$NODEID" --endpoint "$RVC_DEVICE_ENDPOINT" &&
+ ./scripts/tests/chipyaml/chiptool.py tests Test_TC_RVCRUNM_1_1 --PICS "$RVC_DEVICE_PICS" --nodeId "$NODEID" --endpoint "$RVC_DEVICE_ENDPOINT" &&
  echo done
diff --git a/scripts/tests/yaml/__init__.py → scripts/tests/chipyaml/__init__.py b/scripts/tests/yaml/__init__.py → scripts/tests/chipyaml/__init__.py
diff --git a/scripts/tests/yaml/chiptool.py → scripts/tests/chipyaml/chiptool.py b/scripts/tests/yaml/chiptool.py → scripts/tests/chipyaml/chiptool.py
@@ -26,7 +26,7 @@
 from tests_finder import TestsFinder
 from tests_tool import send_raw_command, send_yaml_command
 
-_DEFAULT_EXTENSIONS_DIR = 'scripts/tests/yaml/extensions'
+_DEFAULT_EXTENSIONS_DIR = 'scripts/tests/chipyaml/extensions'
 _DEFAULT_PICS_FILE = 'src/app/tests/suites/certification/ci-pics-values'
 _DEFAULT_SPECIFICATIONS_DIR = 'src/app/zap-templates/zcl/data-model/chip/*.xml'
 

diff --git a/scripts/tests/yaml/darwinframeworktool.py → ...pts/tests/chipyaml/darwinframeworktool.py b/scripts/tests/yaml/darwinframeworktool.py → ...pts/tests/chipyaml/darwinframeworktool.py
@@ -24,7 +24,7 @@
 from runner import CONTEXT_SETTINGS, darwinframeworktool
 from tests_tool import send_raw_command, send_yaml_command
 
-_DEFAULT_EXTENSIONS_DIR = 'scripts/tests/yaml/extensions'
+_DEFAULT_EXTENSIONS_DIR = 'scripts/tests/chipyaml/extensions'
 _DEFAULT_PICS_FILE = 'src/app/tests/suites/certification/ci-pics-values'
 _DEFAULT_SPECIFICATIONS_DIR = 'src/app/zap-templates/zcl/data-model/chip/*.xml'
 

diff --git a/scripts/tests/yaml/extensions/__init__.py → ...pts/tests/chipyaml/extensions/__init__.py b/scripts/tests/yaml/extensions/__init__.py → ...pts/tests/chipyaml/extensions/__init__.py
diff --git a/.../tests/yaml/extensions/example_cluster.py → ...ts/chipyaml/extensions/example_cluster.py b/.../tests/yaml/extensions/example_cluster.py → ...ts/chipyaml/extensions/example_cluster.py
diff --git a/...ns/wildcard_response_extractor_cluster.py → ...ns/wildcard_response_extractor_cluster.py b/...ns/wildcard_response_extractor_cluster.py → ...ns/wildcard_response_extractor_cluster.py
diff --git a/scripts/tests/yaml/paths_finder.py → scripts/tests/chipyaml/paths_finder.py b/scripts/tests/yaml/paths_finder.py → scripts/tests/chipyaml/paths_finder.py
diff --git a/scripts/tests/yaml/relative_importer.py → scripts/tests/chipyaml/relative_importer.py b/scripts/tests/yaml/relative_importer.py → scripts/tests/chipyaml/relative_importer.py
diff --git a/scripts/tests/yaml/runner.py → scripts/tests/chipyaml/runner.py b/scripts/tests/yaml/runner.py → scripts/tests/chipyaml/runner.py
diff --git a/scripts/tests/yaml/tests_finder.py → scripts/tests/chipyaml/tests_finder.py b/scripts/tests/yaml/tests_finder.py → scripts/tests/chipyaml/tests_finder.py
diff --git a/scripts/tests/yaml/tests_logger.py → scripts/tests/chipyaml/tests_logger.py b/scripts/tests/yaml/tests_logger.py → scripts/tests/chipyaml/tests_logger.py
diff --git a/scripts/tests/yaml/tests_tool.py → scripts/tests/chipyaml/tests_tool.py b/scripts/tests/yaml/tests_tool.py → scripts/tests/chipyaml/tests_tool.py
diff --git a/scripts/tests/run_darwin_framework_ota_test.py b/scripts/tests/run_darwin_framework_ota_test.py
@@ -10,7 +10,7 @@
 from chiptest.accessories import AppsRegister
 from chiptest.runner import Runner
 from chiptest.test_definition import App, ExecutionCapture
-from yaml.paths_finder import PathsFinder
+from chipyaml.paths_finder import PathsFinder
 
 TEST_NODE_ID = '0x12344321'
 TEST_VID = '0xFFF1'

diff --git a/scripts/tests/run_test_suite.py b/scripts/tests/run_test_suite.py
@@ -28,7 +28,7 @@
 from chiptest.accessories import AppsRegister
 from chiptest.glob_matcher import GlobMatcher
 from chiptest.test_definition import TestRunTime, TestTag
-from yaml.paths_finder import PathsFinder
+from chipyaml.paths_finder import PathsFinder
 
 DEFAULT_CHIP_ROOT = os.path.abspath(
  os.path.join(os.path.dirname(__file__), '..', '..'))