Skip to content

Commit

Permalink
Revert "TC-IDM-10.2: Add check for MACL (project-chip#35086)" (projec…
Browse files Browse the repository at this point in the history
…t-chip#35111)

This reverts commit 927c818.
  • Loading branch information
cecille authored Aug 21, 2024
1 parent 9e057a3 commit 796394f
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 156 deletions.
1 change: 0 additions & 1 deletion .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -514,7 +514,6 @@ jobs:
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'
scripts/run_in_python_env.sh out/venv 'python3 ./src/python_testing/TestConformanceSupport.py'
scripts/run_in_python_env.sh out/venv 'python3 ./src/python_testing/TestConformanceTest.py'
scripts/run_in_python_env.sh out/venv 'python3 ./src/python_testing/TestChoiceConformanceSupport.py'
scripts/run_in_python_env.sh out/venv 'python3 ./src/python_testing/test_testing/test_IDM_10_4.py'
scripts/run_in_python_env.sh out/venv 'python3 ./src/python_testing/test_testing/test_TC_SC_7_1.py'
Expand Down
23 changes: 0 additions & 23 deletions src/python_testing/TC_DeviceConformance.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,22 +50,6 @@ async def setup_class_helper(self):
self.xml_device_types, problems = build_xml_device_types()
self.problems.extend(problems)

def _get_device_type_id(self, device_type_name: str) -> int:
id = [id for id, dt in self.xml_device_types.items() if dt.name.lower() == device_type_name.lower()]
if len(id) != 1:
self.fail_current_test(f"Unable to find {device_type_name} device type")
return id[0]

def _has_nim(self):
nim_id = self._get_device_type_id('network infrastructure manager')
for endpoint in self.endpoints_tlv.values():
desc = Clusters.Descriptor
device_types = [dt.deviceType for dt in endpoint[desc.id][desc.Attributes.DeviceTypeList.attribute_id]]
if nim_id in device_types:
# TODO: it's unclear if this needs to be present on every endpoint. Right now, this assumes one is sufficient.
return True
return False

def check_conformance(self, ignore_in_progress: bool, is_ci: bool):
problems = []
success = True
Expand Down Expand Up @@ -141,13 +125,6 @@ def record_warning(location, problem):
for f in feature_masks:
location = AttributePathLocation(endpoint_id=endpoint_id, cluster_id=cluster_id,
attribute_id=GlobalAttributeIds.FEATURE_MAP_ID)
if cluster_id == Clusters.AccessControl.id and f == Clusters.AccessControl.Bitmaps.Feature.kManagedDevice:
# Managed ACL is treated as a special case because it is only allowed if other endpoints support NIM and disallowed otherwise.
if not self._has_nim():
record_error(
location=location, problem="MACL feature is disallowed if the Network Infrastructure Manager device type is not present")
continue

if f not in self.xml_clusters[cluster_id].features.keys():
record_error(location=location, problem=f'Unknown feature with mask 0x{f:02x}')
continue
Expand Down
131 changes: 0 additions & 131 deletions src/python_testing/TestConformanceTest.py

This file was deleted.

1 change: 0 additions & 1 deletion src/python_testing/execute_python_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ def main(search_directory, env_file):
"TestChoiceConformanceSupport.py",
"TC_DEMTestBase.py",
"choice_conformance_support.py",
"TestConformanceTest.py", # Unit test of the conformance test (TC_DeviceConformance) - does not run against an app.
"TestIdChecks.py",
"TestSpecParsingDeviceType.py",
"TestMatterTestingSupport.py",
Expand Down

0 comments on commit 796394f

Please sign in to comment.