Skip to content

Commit 3db90a3

Browse files
committed
Revert "TC-IDM-10.2: Add check for MACL (project-chip#35086)"
This reverts commit 927c818.
1 parent 927c818 commit 3db90a3

File tree

4 files changed

+0
-156
lines changed

4 files changed

+0
-156
lines changed

.github/workflows/tests.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,6 @@ jobs:
514514
scripts/run_in_python_env.sh out/venv 'python3 ./src/python_testing/TestIdChecks.py'
515515
scripts/run_in_python_env.sh out/venv 'python3 ./src/python_testing/TestSpecParsingDeviceType.py'
516516
scripts/run_in_python_env.sh out/venv 'python3 ./src/python_testing/TestConformanceSupport.py'
517-
scripts/run_in_python_env.sh out/venv 'python3 ./src/python_testing/TestConformanceTest.py'
518517
scripts/run_in_python_env.sh out/venv 'python3 ./src/python_testing/TestChoiceConformanceSupport.py'
519518
scripts/run_in_python_env.sh out/venv 'python3 ./src/python_testing/test_testing/test_IDM_10_4.py'
520519
scripts/run_in_python_env.sh out/venv 'python3 ./src/python_testing/test_testing/test_TC_SC_7_1.py'

src/python_testing/TC_DeviceConformance.py

-23
Original file line numberDiff line numberDiff line change
@@ -50,22 +50,6 @@ async def setup_class_helper(self):
5050
self.xml_device_types, problems = build_xml_device_types()
5151
self.problems.extend(problems)
5252

53-
def _get_device_type_id(self, device_type_name: str) -> int:
54-
id = [id for id, dt in self.xml_device_types.items() if dt.name.lower() == device_type_name.lower()]
55-
if len(id) != 1:
56-
self.fail_current_test(f"Unable to find {device_type_name} device type")
57-
return id[0]
58-
59-
def _has_nim(self):
60-
nim_id = self._get_device_type_id('network infrastructure manager')
61-
for endpoint in self.endpoints_tlv.values():
62-
desc = Clusters.Descriptor
63-
device_types = [dt.deviceType for dt in endpoint[desc.id][desc.Attributes.DeviceTypeList.attribute_id]]
64-
if nim_id in device_types:
65-
# TODO: it's unclear if this needs to be present on every endpoint. Right now, this assumes one is sufficient.
66-
return True
67-
return False
68-
6953
def check_conformance(self, ignore_in_progress: bool, is_ci: bool):
7054
problems = []
7155
success = True
@@ -141,13 +125,6 @@ def record_warning(location, problem):
141125
for f in feature_masks:
142126
location = AttributePathLocation(endpoint_id=endpoint_id, cluster_id=cluster_id,
143127
attribute_id=GlobalAttributeIds.FEATURE_MAP_ID)
144-
if cluster_id == Clusters.AccessControl.id and f == Clusters.AccessControl.Bitmaps.Feature.kManagedDevice:
145-
# Managed ACL is treated as a special case because it is only allowed if other endpoints support NIM and disallowed otherwise.
146-
if not self._has_nim():
147-
record_error(
148-
location=location, problem="MACL feature is disallowed if the Network Infrastructure Manager device type is not present")
149-
continue
150-
151128
if f not in self.xml_clusters[cluster_id].features.keys():
152129
record_error(location=location, problem=f'Unknown feature with mask 0x{f:02x}')
153130
continue

src/python_testing/TestConformanceTest.py

-131
This file was deleted.

src/python_testing/execute_python_tests.py

-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ def main(search_directory, env_file):
8787
"TestChoiceConformanceSupport.py",
8888
"TC_DEMTestBase.py",
8989
"choice_conformance_support.py",
90-
"TestConformanceTest.py", # Unit test of the conformance test (TC_DeviceConformance) - does not run against an app.
9190
"TestIdChecks.py",
9291
"TestSpecParsingDeviceType.py",
9392
"TestMatterTestingSupport.py",

0 commit comments

Comments
 (0)