Renamed testing_support to matter_testing _support

Author: vatsalghelani-csa

BUILD.gn

@@ -69,7 +69,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",
-    "//src/python_testing/matter_testing_infrastructure:testing_support",
+    "//src/python_testing/matter_testing_infrastructure:matter_testing_support",
   ]
 
   pw_python_venv("matter_build_venv") {
@@ -110,7 +110,7 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
       deps = [
         "${chip_root}/scripts:matter_yamltests_distribution.wheel",
         "${chip_root}/src/controller/python:chip-repl",
-        "${chip_root}/src/python_testing/matter_testing_infrastructure:testing_support.wheel",
+        "${chip_root}/src/python_testing/matter_testing_infrastructure:matter_testing_support.wheel",
       ]
       if (enable_pylib) {
         deps += [ "${chip_root}/src/pybindings/pycontroller" ]
@@ -239,7 +239,7 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
         "//scripts/py_matter_idl:matter_idl.tests",
         "//scripts/py_matter_yamltests:matter_yamltests.tests",
         "//src:tests_run",
-        "//src/python_testing/matter_testing_infrastructure:testing_support.tests",
+        "//src/python_testing/matter_testing_infrastructure:matter_testing_support.tests",
       ]
 
       if (current_os == "linux" || current_os == "mac") {

docs/testing/python.md

@@ -25,7 +25,7 @@ Python tests located in src/python_testing
         section should include various parameters and their respective values,
         which will guide the test runner on how to execute the tests.
 -   All test classes inherit from `MatterBaseTest` in
-    [matter_testing.py](https://github.com/project-chip/connectedhomeip/blob/master/src/python_testing/matter_testing_infrastructure/testing_support/matter_testing.py)
+    [matter_testing.py](https://github.com/project-chip/connectedhomeip/blob/master/src/python_testing/matter_testing_infrastructure/matter_testing_support/matter_testing.py)
     -   Support for commissioning using the python controller
     -   Default controller (`self.default_controller`) of type `ChipDeviceCtrl`
     -   `MatterBaseTest` inherits from the Mobly BaseTestClass
@@ -372,7 +372,7 @@ pai = await dev_ctrl.SendCommand(nodeid, 0, Clusters.OperationalCredentials.Comm
 ## Mobly helpers
 
 The test system is based on Mobly, and the
-[matter_testing.py](https://github.com/project-chip/connectedhomeip/blob/master/src/python_testing/matter_testing_infrastructure/testing_support/matter_testing.py)
+[matter_testing.py](https://github.com/project-chip/connectedhomeip/blob/master/src/python_testing/matter_testing_infrastructure/matter_testing_support/matter_testing.py)
 class provides some helpers for Mobly integration.
 
 -   `default_matter_test_main`

scripts/build_python.sh

@@ -213,7 +213,7 @@ else
 fi
 
 # Add the matter_testing_infrastructure wheel
-WHEEL+=("$OUTPUT_ROOT"/python/obj/src/python_testing/matter_testing_infrastructure/testing_support._build_wheel/testing_support-*.whl)
+WHEEL+=("$OUTPUT_ROOT"/python/obj/src/python_testing/matter_testing_infrastructure/matter_testing_support._build_wheel/matter_testing_support-*.whl)
 
 if [ -n "$extra_packages" ]; then
     WHEEL+=("$extra_packages")

scripts/spec_xml/generate_spec_xml.py

@@ -202,7 +202,7 @@ def dump_cluster_ids(output_dir):
     clusters_output_dir = os.path.abspath(
         os.path.join(output_dir, 'clusters'))
 
-    from testing_support.spec_parsing import build_xml_clusters
+    from matter_testing_support.spec_parsing import build_xml_clusters
 
     header = '# List of currently defined spec clusters\n'
     header += 'This file was **AUTOMATICALLY** generated by `python scripts/generate_spec_xml.py`. DO NOT EDIT BY HAND!\n\n'

scripts/tests/run_python_test.py

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

src/python_testing/MinimalRepresentation.py

@@ -18,9 +18,9 @@
 from dataclasses import dataclass, field
 
 from chip.tlv import uint
-from testing_support.conformance import ConformanceDecision
-from testing_support.global_attribute_ids import GlobalAttributeIds
-from testing_support.matter_testing import MatterBaseTest, async_test_body, default_matter_test_main
+from matter_testing_support.conformance import ConformanceDecision
+from matter_testing_support.global_attribute_ids import GlobalAttributeIds
+from matter_testing_support.matter_testing import MatterBaseTest, async_test_body, default_matter_test_main
 from TC_DeviceConformance import DeviceConformanceTests
 
 

src/python_testing/TCP_Tests.py

@@ -26,7 +26,7 @@
 import chip.clusters as Clusters
 from chip import ChipDeviceCtrl
 from chip.interaction_model import InteractionModelError
-from testing_support.matter_testing import MatterBaseTest, async_test_body, default_matter_test_main
+from matter_testing_support.matter_testing import MatterBaseTest, async_test_body, default_matter_test_main
 from mobly import asserts
 
 

src/python_testing/TC_ACE_1_2.py

@@ -35,7 +35,7 @@
 from chip.clusters.Attribute import EventReadResult, SubscriptionTransaction, TypedAttributePath
 from chip.exceptions import ChipStackError
 from chip.interaction_model import Status
-from testing_support.matter_testing import MatterBaseTest, async_test_body, default_matter_test_main
+from matter_testing_support.matter_testing import MatterBaseTest, async_test_body, default_matter_test_main
 from mobly import asserts
 
 

src/python_testing/TC_ACE_1_3.py

@@ -31,7 +31,7 @@
 
 import chip.clusters as Clusters
 from chip.interaction_model import Status
-from testing_support.matter_testing import MatterBaseTest, TestStep, async_test_body, default_matter_test_main
+from matter_testing_support.matter_testing import MatterBaseTest, TestStep, async_test_body, default_matter_test_main
 from mobly import asserts
 
 

src/python_testing/TC_ACE_1_4.py

@@ -31,7 +31,7 @@
 
 import chip.clusters as Clusters
 from chip.interaction_model import Status
-from testing_support.matter_testing import MatterBaseTest, async_test_body, default_matter_test_main
+from matter_testing_support.matter_testing import MatterBaseTest, async_test_body, default_matter_test_main
 from mobly import asserts
 
 # This test requires several additional command line arguments

src/python_testing/TC_ACE_1_5.py

@@ -32,7 +32,7 @@
 import chip.clusters as Clusters
 from chip import ChipDeviceCtrl
 from chip.interaction_model import Status
-from testing_support.matter_testing import MatterBaseTest, async_test_body, default_matter_test_main
+from matter_testing_support.matter_testing import MatterBaseTest, async_test_body, default_matter_test_main
 from mobly import asserts
 
 

src/python_testing/TC_ACL_2_2.py

@@ -25,7 +25,7 @@
 # === END CI TEST ARGUMENTS ===
 
 import chip.clusters as Clusters
-from testing_support.matter_testing import MatterBaseTest, TestStep, async_test_body, default_matter_test_main
+from matter_testing_support.matter_testing import MatterBaseTest, TestStep, async_test_body, default_matter_test_main
 from mobly import asserts
 
 

src/python_testing/TC_AccessChecker.py

@@ -16,13 +16,13 @@
 from typing import Optional
 
 import chip.clusters as Clusters
-from testing_support.basic_composition import BasicCompositionTests
+from matter_testing_support.basic_composition import BasicCompositionTests
 from chip.interaction_model import Status
 from chip.tlv import uint
-from testing_support.global_attribute_ids import GlobalAttributeIds
-from testing_support.matter_testing import (AttributePathLocation, ClusterPathLocation, MatterBaseTest, TestStep, async_test_body,
-                                            default_matter_test_main)
-from testing_support.spec_parsing import XmlCluster, build_xml_clusters
+from matter_testing_support.global_attribute_ids import GlobalAttributeIds
+from matter_testing_support.matter_testing import (AttributePathLocation, ClusterPathLocation, MatterBaseTest, TestStep, async_test_body,
+                                                   default_matter_test_main)
+from matter_testing_support.spec_parsing import XmlCluster, build_xml_clusters
 
 
 class AccessTestType(Enum):

src/python_testing/TC_BOOLCFG_2_1.py

@@ -29,7 +29,7 @@
 from operator import ior
 
 import chip.clusters as Clusters
-from testing_support.matter_testing import MatterBaseTest, TestStep, async_test_body, default_matter_test_main
+from matter_testing_support.matter_testing import MatterBaseTest, TestStep, async_test_body, default_matter_test_main
 from mobly import asserts
 
 

src/python_testing/TC_BOOLCFG_3_1.py

@@ -29,7 +29,7 @@
 
 import chip.clusters as Clusters
 from chip.interaction_model import Status
-from testing_support.matter_testing import MatterBaseTest, TestStep, async_test_body, default_matter_test_main
+from matter_testing_support.matter_testing import MatterBaseTest, TestStep, async_test_body, default_matter_test_main
 from mobly import asserts
 
 

src/python_testing/TC_BOOLCFG_4_1.py

@@ -27,7 +27,7 @@
 import logging
 
 import chip.clusters as Clusters
-from testing_support.matter_testing import MatterBaseTest, TestStep, async_test_body, default_matter_test_main
+from matter_testing_support.matter_testing import MatterBaseTest, TestStep, async_test_body, default_matter_test_main
 from mobly import asserts
 
 

src/python_testing/TC_BOOLCFG_4_2.py

@@ -28,7 +28,7 @@
 
 import chip.clusters as Clusters
 from chip.interaction_model import InteractionModelError, Status
-from testing_support.matter_testing import MatterBaseTest, TestStep, async_test_body, default_matter_test_main
+from matter_testing_support.matter_testing import MatterBaseTest, TestStep, async_test_body, default_matter_test_main
 from mobly import asserts
 
 sensorTrigger = 0x0080_0000_0000_0000

src/python_testing/TC_BOOLCFG_4_3.py

@@ -28,7 +28,7 @@
 
 import chip.clusters as Clusters
 from chip.interaction_model import InteractionModelError, Status
-from testing_support.matter_testing import MatterBaseTest, TestStep, async_test_body, default_matter_test_main
+from matter_testing_support.matter_testing import MatterBaseTest, TestStep, async_test_body, default_matter_test_main
 from mobly import asserts
 
 sensorTrigger = 0x0080_0000_0000_0000

src/python_testing/TC_BOOLCFG_4_4.py

@@ -28,7 +28,7 @@
 
 import chip.clusters as Clusters
 from chip.interaction_model import InteractionModelError, Status
-from testing_support.matter_testing import MatterBaseTest, TestStep, async_test_body, default_matter_test_main
+from matter_testing_support.matter_testing import MatterBaseTest, TestStep, async_test_body, default_matter_test_main
 from mobly import asserts
 
 sensorTrigger = 0x0080_0000_0000_0000

src/python_testing/TC_BOOLCFG_5_1.py

@@ -28,7 +28,7 @@
 
 import chip.clusters as Clusters
 from chip.interaction_model import InteractionModelError, Status
-from testing_support.matter_testing import MatterBaseTest, TestStep, async_test_body, default_matter_test_main
+from matter_testing_support.matter_testing import MatterBaseTest, TestStep, async_test_body, default_matter_test_main
 from mobly import asserts
 
 sensorTrigger = 0x0080_0000_0000_0000

src/python_testing/TC_BOOLCFG_5_2.py

@@ -28,7 +28,7 @@
 
 import chip.clusters as Clusters
 from chip.interaction_model import InteractionModelError, Status
-from testing_support.matter_testing import MatterBaseTest, TestStep, async_test_body, default_matter_test_main
+from matter_testing_support.matter_testing import MatterBaseTest, TestStep, async_test_body, default_matter_test_main
 from mobly import asserts
 
 sensorTrigger = 0x0080_0000_0000_0000

src/python_testing/TC_BRBINFO_4_1.py

@@ -30,7 +30,7 @@
 
 import chip.clusters as Clusters
 from chip import ChipDeviceCtrl
-from testing_support.matter_testing import MatterBaseTest, SimpleEventCallback, TestStep, async_test_body, default_matter_test_main
+from matter_testing_support.matter_testing import MatterBaseTest, SimpleEventCallback, TestStep, async_test_body, default_matter_test_main
 from mobly import asserts
 
 logger = logging.getLogger(__name__)

src/python_testing/TC_CADMIN_1_9.py

@@ -31,7 +31,7 @@
 from chip import ChipDeviceCtrl
 from chip.ChipDeviceCtrl import CommissioningParameters
 from chip.exceptions import ChipStackError
-from testing_support.matter_testing import MatterBaseTest, TestStep, async_test_body, default_matter_test_main
+from matter_testing_support.matter_testing import MatterBaseTest, TestStep, async_test_body, default_matter_test_main
 from mobly import asserts
 
 

src/python_testing/TC_CCTRL_2_1.py

@@ -16,7 +16,7 @@
 #
 
 import chip.clusters as Clusters
-from testing_support.matter_testing import MatterBaseTest, TestStep, default_matter_test_main, has_cluster, per_endpoint_test
+from matter_testing_support.matter_testing import MatterBaseTest, TestStep, default_matter_test_main, has_cluster, per_endpoint_test
 from mobly import asserts
 
 

src/python_testing/TC_CCTRL_2_2.py

@@ -34,8 +34,8 @@
 import chip.clusters as Clusters
 from chip import ChipDeviceCtrl
 from chip.interaction_model import InteractionModelError, Status
-from testing_support.matter_testing import (MatterBaseTest, TestStep, async_test_body, default_matter_test_main, has_cluster,
-                                            per_endpoint_test)
+from matter_testing_support.matter_testing import (MatterBaseTest, TestStep, async_test_body, default_matter_test_main, has_cluster,
+                                                   per_endpoint_test)
 from mobly import asserts
 
 

src/python_testing/TC_CC_10_1.py

@@ -32,7 +32,7 @@
 
 import chip.clusters as Clusters
 from chip.interaction_model import Status
-from testing_support.matter_testing import MatterBaseTest, TestStep, async_test_body, default_matter_test_main
+from matter_testing_support.matter_testing import MatterBaseTest, TestStep, async_test_body, default_matter_test_main
 from mobly import asserts
 
 kCCAttributeValueIDs = [0x0001, 0x0003, 0x0004, 0x0007, 0x4000, 0x4001, 0x4002, 0x4003, 0x4004]

src/python_testing/TC_CC_2_2.py

@@ -32,8 +32,8 @@
 
 import chip.clusters as Clusters
 from chip.clusters import ClusterObjects as ClusterObjects
-from testing_support.matter_testing import (ClusterAttributeChangeAccumulator, MatterBaseTest, TestStep, default_matter_test_main,
-                                            has_cluster, per_endpoint_test)
+from matter_testing_support.matter_testing import (ClusterAttributeChangeAccumulator, MatterBaseTest, TestStep, default_matter_test_main,
+                                                   has_cluster, per_endpoint_test)
 from mobly import asserts
 from test_plan_support import commission_if_required, if_feature_supported, read_attribute, verify_success
 

src/python_testing/TC_CGEN_2_4.py

@@ -38,7 +38,7 @@
 from chip import ChipDeviceCtrl
 from chip.ChipDeviceCtrl import CommissioningParameters
 from chip.exceptions import ChipStackError
-from testing_support.matter_testing import MatterBaseTest, async_test_body, default_matter_test_main
+from matter_testing_support.matter_testing import MatterBaseTest, async_test_body, default_matter_test_main
 from mobly import asserts
 
 # Commissioning stage numbers - we should find a better way to match these to the C++ code

src/python_testing/TC_CNET_1_4.py

@@ -30,7 +30,7 @@
 import logging
 
 import chip.clusters as Clusters
-from testing_support.matter_testing import MatterBaseTest, TestStep, async_test_body, default_matter_test_main
+from matter_testing_support.matter_testing import MatterBaseTest, TestStep, async_test_body, default_matter_test_main
 from mobly import asserts
 
 kRootEndpointId = 0

src/python_testing/TC_CNET_4_4.py

@@ -22,7 +22,7 @@
 
 import chip.clusters as Clusters
 from chip.clusters.Types import NullValue
-from testing_support.matter_testing import MatterBaseTest, TestStep, async_test_body, default_matter_test_main, type_matches
+from matter_testing_support.matter_testing import MatterBaseTest, TestStep, async_test_body, default_matter_test_main, type_matches
 from mobly import asserts
 
 

src/python_testing/TC_DA_1_2.py

@@ -32,7 +32,7 @@
 import re
 
 import chip.clusters as Clusters
-from testing_support.basic_composition import BasicCompositionTests
+from matter_testing_support.basic_composition import BasicCompositionTests
 from chip.interaction_model import InteractionModelError, Status
 from chip.tlv import TLVReader
 from cryptography import x509
@@ -41,7 +41,7 @@
 from cryptography.hazmat.primitives import hashes
 from cryptography.hazmat.primitives.asymmetric import ec, utils
 from ecdsa.curves import curve_by_name
-from testing_support.matter_testing import MatterBaseTest, TestStep, async_test_body, default_matter_test_main, hex_from_bytes, type_matches
+from matter_testing_support.matter_testing import MatterBaseTest, TestStep, async_test_body, default_matter_test_main, hex_from_bytes, type_matches
 from mobly import asserts
 from pyasn1.codec.der.decoder import decode as der_decoder
 from pyasn1.error import PyAsn1Error

src/python_testing/TC_DA_1_5.py

@@ -37,7 +37,7 @@
 from cryptography.hazmat.primitives import hashes
 from cryptography.hazmat.primitives.asymmetric import ec, utils
 from ecdsa.curves import curve_by_name
-from testing_support.matter_testing import MatterBaseTest, async_test_body, default_matter_test_main, hex_from_bytes, type_matches
+from matter_testing_support.matter_testing import MatterBaseTest, async_test_body, default_matter_test_main, hex_from_bytes, type_matches
 from mobly import asserts
 from pyasn1.codec.der.decoder import decode as der_decoder
 from pyasn1.error import PyAsn1Error

src/python_testing/TC_DA_1_7.py

@@ -38,8 +38,8 @@
 from cryptography.hazmat.primitives.asymmetric import ec
 from cryptography.hazmat.primitives.serialization import Encoding, PublicFormat
 from cryptography.x509 import AuthorityKeyIdentifier, Certificate, SubjectKeyIdentifier, load_der_x509_certificate
-from testing_support.matter_testing import (MatterBaseTest, TestStep, async_test_body, bytes_from_hex, default_matter_test_main,
-                                            hex_from_bytes)
+from matter_testing_support.matter_testing import (MatterBaseTest, TestStep, async_test_body, bytes_from_hex, default_matter_test_main,
+                                                   hex_from_bytes)
 from mobly import asserts
 
 # Those are SDK samples that are known to be non-production.

src/python_testing/TC_DEMTestBase.py

@@ -19,7 +19,7 @@
 
 import chip.clusters as Clusters
 from chip.interaction_model import InteractionModelError, Status
-from testing_support.matter_testing import utc_time_in_matter_epoch
+from matter_testing_support.matter_testing import utc_time_in_matter_epoch
 from mobly import asserts
 
 logger = logging.getLogger(__name__)

src/python_testing/TC_DEM_2_2.py

@@ -37,7 +37,7 @@
 
 import chip.clusters as Clusters
 from chip.interaction_model import Status
-from testing_support.matter_testing import EventChangeCallback, MatterBaseTest, TestStep, async_test_body, default_matter_test_main
+from matter_testing_support.matter_testing import EventChangeCallback, MatterBaseTest, TestStep, async_test_body, default_matter_test_main
 from mobly import asserts
 from TC_DEMTestBase import DEMTestBase
 

src/python_testing/TC_DEM_2_3.py

@@ -31,7 +31,7 @@
 import chip.clusters as Clusters
 from chip.clusters.Types import NullValue
 from chip.interaction_model import Status
-from testing_support.matter_testing import EventChangeCallback, MatterBaseTest, TestStep, async_test_body, default_matter_test_main
+from matter_testing_support.matter_testing import EventChangeCallback, MatterBaseTest, TestStep, async_test_body, default_matter_test_main
 from mobly import asserts
 from TC_DEMTestBase import DEMTestBase
 

src/python_testing/TC_DEM_2_4.py

@@ -32,7 +32,7 @@
 import chip.clusters as Clusters
 from chip.clusters.Types import NullValue
 from chip.interaction_model import Status
-from testing_support.matter_testing import EventChangeCallback, MatterBaseTest, TestStep, async_test_body, default_matter_test_main
+from matter_testing_support.matter_testing import EventChangeCallback, MatterBaseTest, TestStep, async_test_body, default_matter_test_main
 from mobly import asserts
 from TC_DEMTestBase import DEMTestBase
 

src/python_testing/TC_DEM_2_5.py

@@ -34,7 +34,7 @@
 
 import chip.clusters as Clusters
 from chip.interaction_model import Status
-from testing_support.matter_testing import EventChangeCallback, MatterBaseTest, TestStep, async_test_body, default_matter_test_main
+from matter_testing_support.matter_testing import EventChangeCallback, MatterBaseTest, TestStep, async_test_body, default_matter_test_main
 from mobly import asserts
 from TC_DEMTestBase import DEMTestBase