Skip to content

Commit ed87048

Browse files
authored
Remove old workaround (#33851)
1 parent 93818c4 commit ed87048

File tree

2 files changed

+1
-10
lines changed

2 files changed

+1
-10
lines changed

src/python_testing/TC_DeviceConformance.py

-9
Original file line numberDiff line numberDiff line change
@@ -56,16 +56,11 @@ def record_warning(location, problem):
5656
record_problem(location, problem, ProblemSeverity.WARNING)
5757

5858
ignore_attributes: dict[int, list[int]] = {}
59-
ignore_features: dict[int, list[int]] = {}
6059
if ignore_in_progress:
6160
# This is a manually curated list of attributes that are in-progress in the SDK, but have landed in the spec
6261
in_progress_attributes = {Clusters.BasicInformation.id: [0x15, 0x016],
6362
Clusters.PowerSource.id: [0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A]}
6463
ignore_attributes.update(in_progress_attributes)
65-
# The spec currently has an error on the power source features
66-
# This should be removed once https://github.com/CHIP-Specifications/connectedhomeip-spec/pull/7823 lands
67-
in_progress_features = {Clusters.PowerSource.id: [(1 << 2), (1 << 3), (1 << 4), (1 << 5)]}
68-
ignore_features.update(in_progress_features)
6964

7065
if is_ci:
7166
# The network commissioning clusters on the CI select the features on the fly and end up non-conformant
@@ -116,15 +111,11 @@ def record_warning(location, problem):
116111
if f not in self.xml_clusters[cluster_id].features.keys():
117112
record_error(location=location, problem=f'Unknown feature with mask 0x{f:02x}')
118113
continue
119-
if cluster_id in ignore_features and f in ignore_features[cluster_id]:
120-
continue
121114
xml_feature = self.xml_clusters[cluster_id].features[f]
122115
conformance_decision = xml_feature.conformance(feature_map, attribute_list, all_command_list)
123116
if not conformance_allowed(conformance_decision, allow_provisional):
124117
record_error(location=location, problem=f'Disallowed feature with mask 0x{f:02x}')
125118
for feature_mask, xml_feature in self.xml_clusters[cluster_id].features.items():
126-
if cluster_id in ignore_features and feature_mask in ignore_features[cluster_id]:
127-
continue
128119
conformance_decision = xml_feature.conformance(feature_map, attribute_list, all_command_list)
129120
if conformance_decision == ConformanceDecision.MANDATORY and feature_mask not in feature_masks:
130121
record_error(

src/python_testing/spec_parsing_support.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ def check_clusters_for_unknown_commands(clusters: dict[int, XmlCluster], problem
447447
endpoint_id=0, cluster_id=id, command_id=cmd.id), severity=ProblemSeverity.WARNING, problem="Command with unknown direction"))
448448

449449

450-
def build_xml_clusters() -> tuple[list[XmlCluster], list[ProblemNotice]]:
450+
def build_xml_clusters() -> tuple[dict[int, XmlCluster], list[ProblemNotice]]:
451451
dir = os.path.join(os.path.dirname(os.path.realpath(__file__)), '..', '..', 'data_model', 'clusters')
452452
clusters: dict[int, XmlCluster] = {}
453453
pure_base_clusters: dict[str, XmlCluster] = {}

0 commit comments

Comments
 (0)