Added fixes as per module build for metadata_testing_infrastructure

Author: vatsalghelani-csa

BUILD.gn

@@ -67,6 +67,7 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
     "//examples/common/pigweed/rpc_console/py:chip_rpc",
     "//integrations/mobly:chip_mobly",
     "//scripts/py_matter_yamltests:matter_yamltests",
+    "//scripts/tests/py:matter_testing_infrastructure",
   ]
 
   pw_python_venv("matter_build_venv") {
@@ -106,7 +107,7 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
     if (chip_enable_python_modules) {
       deps = [
         "${chip_root}/scripts:matter_yamltests_distribution.wheel",
-        "${chip_root}/scripts/tests/py:metadata_parser.wheel",
+        "${chip_root}/scripts/tests/py:matter_testing_infrastructure.wheel",
         "${chip_root}/src/controller/python:chip-repl",
       ]
       if (enable_pylib) {
@@ -233,7 +234,7 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
         "//scripts/build:build_examples.tests",
         "//scripts/py_matter_idl:matter_idl.tests",
         "//scripts/py_matter_yamltests:matter_yamltests.tests",
-        "//scripts/tests/py:metadata_parser.tests",
+        "//scripts/tests/py:matter_testing_infrastructure.tests",
         "//src:tests_run",
       ]
 

scripts/build_python.sh

@@ -80,78 +80,78 @@ file_name=${0##*/}
 
 while (($#)); do
     case $1 in
-        --help | -h)
-            help
-            exit 1
-            ;;
-        --enable_ble | -b)
-            enable_ble=$2
-            if [[ "$enable_ble" != "true" && "$enable_ble" != "false" ]]; then
-                echo "chip_detail_logging should have a true/false value, not '$enable_ble'"
-                exit
-            fi
-            shift
-            ;;
-        --chip_detail_logging | -d)
-            chip_detail_logging=$2
-            if [[ "$chip_detail_logging" != "true" && "$chip_detail_logging" != "false" ]]; then
-                echo "chip_detail_logging should have a true/false value, not '$chip_detail_logging'"
-                exit
-            fi
-            shift
-            ;;
-        --chip_mdns | -m)
-            chip_mdns=$2
-            shift
-            ;;
-        --enable_pybindings | -p)
-            enable_pybindings=$2
-            if [[ "$enable_pybindings" != "true" && "$enable_pybindings" != "false" ]]; then
-                echo "enable_pybindings should have a true/false value, not '$enable_pybindings'"
-                exit
-            fi
-            shift
-            ;;
-        --time_between_case_retries | -t)
-            chip_case_retry_delta=$2
-            shift
-            ;;
-        --install_virtual_env | -i)
-            install_virtual_env=$2
-            shift
-            ;;
-        --clean_virtual_env | -c)
-            clean_virtual_env=$2
-            if [[ "$clean_virtual_env" != "yes" && "$clean_virtual_env" != "no" ]]; then
-                echo "clean_virtual_env should have a yes/no value, not '$clean_virtual_env'"
-                exit
-            fi
-            shift
-            ;;
-        --include_pytest_deps)
-            install_pytest_requirements=$2
-            if [[ "$install_pytest_requirements" != "yes" && "$install_pytest_requirements" != "no" ]]; then
-                echo "install_pytest_requirements should have a yes/no value, not '$install_pytest_requirements'"
-                exit
-            fi
-            shift
-            ;;
-        --extra_packages)
-            extra_packages=$2
-            shift
-            ;;
-        --pregen_dir | -z)
-            pregen_dir=$2
-            shift
-            ;;
-        --jupyter-lab | -j)
-            install_jupyterlab=yes
-            ;;
-        -*)
-            help
-            echo "Unknown Option \"$1\""
-            exit 1
-            ;;
+    --help | -h)
+        help
+        exit 1
+        ;;
+    --enable_ble | -b)
+        enable_ble=$2
+        if [[ "$enable_ble" != "true" && "$enable_ble" != "false" ]]; then
+            echo "chip_detail_logging should have a true/false value, not '$enable_ble'"
+            exit
+        fi
+        shift
+        ;;
+    --chip_detail_logging | -d)
+        chip_detail_logging=$2
+        if [[ "$chip_detail_logging" != "true" && "$chip_detail_logging" != "false" ]]; then
+            echo "chip_detail_logging should have a true/false value, not '$chip_detail_logging'"
+            exit
+        fi
+        shift
+        ;;
+    --chip_mdns | -m)
+        chip_mdns=$2
+        shift
+        ;;
+    --enable_pybindings | -p)
+        enable_pybindings=$2
+        if [[ "$enable_pybindings" != "true" && "$enable_pybindings" != "false" ]]; then
+            echo "enable_pybindings should have a true/false value, not '$enable_pybindings'"
+            exit
+        fi
+        shift
+        ;;
+    --time_between_case_retries | -t)
+        chip_case_retry_delta=$2
+        shift
+        ;;
+    --install_virtual_env | -i)
+        install_virtual_env=$2
+        shift
+        ;;
+    --clean_virtual_env | -c)
+        clean_virtual_env=$2
+        if [[ "$clean_virtual_env" != "yes" && "$clean_virtual_env" != "no" ]]; then
+            echo "clean_virtual_env should have a yes/no value, not '$clean_virtual_env'"
+            exit
+        fi
+        shift
+        ;;
+    --include_pytest_deps)
+        install_pytest_requirements=$2
+        if [[ "$install_pytest_requirements" != "yes" && "$install_pytest_requirements" != "no" ]]; then
+            echo "install_pytest_requirements should have a yes/no value, not '$install_pytest_requirements'"
+            exit
+        fi
+        shift
+        ;;
+    --extra_packages)
+        extra_packages=$2
+        shift
+        ;;
+    --pregen_dir | -z)
+        pregen_dir=$2
+        shift
+        ;;
+    --jupyter-lab | -j)
+        install_jupyterlab=yes
+        ;;
+    -*)
+        help
+        echo "Unknown Option \"$1\""
+        exit 1
+        ;;
     esac
     shift
 done
@@ -212,6 +212,9 @@ else
     WHEEL=("$OUTPUT_ROOT"/controller/python/chip*.whl)
 fi
 
+# Add the matter_testing_infrastructure wheel
+WHEEL+=("$OUTPUT_ROOT"/python/obj/scripts/tests/py/matter_testing_infrastructure._build_wheel/matter_testing_infrastructure-*.whl)
+
 if [ -n "$extra_packages" ]; then
     WHEEL+=("$extra_packages")
 fi

scripts/tests/py/BUILD.gn

@@ -18,7 +18,7 @@ import("//build_overrides/chip.gni")
 import("//build_overrides/pigweed.gni")
 import("$dir_pw_build/python.gni")
 
-pw_python_package("metadata_parser") {
+pw_python_package("matter_testing_infrastructure") {
   setup = [
     "setup.py",
     "setup.cfg",
@@ -28,9 +28,9 @@ pw_python_package("metadata_parser") {
   inputs = [ "env_test.yaml" ]
 
   sources = [
-    "metadata_parser/__init__.py",
-    "metadata_parser/metadata.py",
+    "matter_testing_infrastructure/__init__.py",
+    "matter_testing_infrastructure/metadata.py",
   ]
 
-  tests = [ "metadata_parser/test_metadata.py" ]
+  tests = [ "matter_testing_infrastructure/test_metadata.py" ]
 }

scripts/tests/py/metadata_parser/__init__.py scripts/tests/py/matter_testing_infrastructure/__init__.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 [metadata]
-name = metadata_parser
+name = matter_testing_infrastructure
 version = 0.0.1
 author = Project CHIP Authors
-description = Scripts to get metadata (runner arguments) associated with the python_testing scripts
+description = Scripts to get metadata (runner arguments) associated with the python_testing scripts

scripts/tests/py/metadata_parser/metadata.py scripts/tests/py/matter_testing_infrastructure/metadata.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 
-"""The metadata_parser package."""
+"""The matter_testing_infrastructure package."""
 
 import setuptools  # type: ignore
 

scripts/tests/py/metadata_parser/test_metadata.py scripts/tests/py/matter_testing_infrastructure/test_metadata.py

@@ -32,7 +32,7 @@
 import click
 import coloredlogs
 from colorama import Fore, Style
-from py.metadata_parser.metadata import Metadata, MetadataReader
+from matter_testing_infrastructure.metadata import Metadata, MetadataReader
 
 DEFAULT_CHIP_ROOT = os.path.abspath(
     os.path.join(os.path.dirname(__file__), '..', '..'))