Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,11 @@ id _Nullable MTRDecodeAttributeValue(const chip::app::ConcreteAttributePath & aP
id _Nullable MTRDecodeAttributeValue(const chip::app::ConcreteAttributePath & aPath, const chip::app::ClusterStateCache & aCache,
CHIP_ERROR * aError);

// Decodes an attribute value for private clusters or private extensions on spec clusters.
// Returns CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB in *aError for unknown paths, matching
// MTRDecodeAttributeValue's convention. Call as a fallback only when MTRDecodeAttributeValue
// has already reported CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB.
id _Nullable MTRPrivateDecodeAttributeValue(const chip::app::ConcreteAttributePath & aPath, chip::TLV::TLVReader & aReader,
CHIP_ERROR * aError);

NS_ASSUME_NONNULL_END
21 changes: 17 additions & 4 deletions src/darwin/Framework/CHIP/MTRBaseDevice.mm
Original file line number Diff line number Diff line change
Expand Up @@ -3235,8 +3235,18 @@ - (nullable instancetype)initWithResponseValue:(NSDictionary<NSString *, id> *)r
}

if (errorCode == CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB) {
LogStringAndReturnError(@"No known schema for decoding attribute value.", MTRErrorCodeUnknownSchema, error);
return nil;
decodedValue = MTRPrivateDecodeAttributeValue(attributePath, reader, &errorCode);
if (errorCode == CHIP_NO_ERROR) {
_path = path;
_value = decodedValue;
_error = nil;
return self;
}

if (errorCode == CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB) {
LogStringAndReturnError(@"No known schema for decoding attribute value.", MTRErrorCodeUnknownSchema, error);
return nil;
}
}

// Treat all other errors as schema errors.
Expand Down Expand Up @@ -3470,8 +3480,11 @@ - (NSNumber *)timestamp
CHIP_ERROR err;
value = MTRDecodeAttributeValue(aPath, *apData, &err);
if (err == CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB) {
// We don't know this attribute; just skip it.
return;
value = MTRPrivateDecodeAttributeValue(aPath, *apData, &err);
if (err == CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB) {
// We don't know this attribute; just skip it.
return;
}
}

if (err != CHIP_NO_ERROR) {
Expand Down
9 changes: 9 additions & 0 deletions src/python_testing/test_metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,15 @@ not_automated:
onboarding data security requirements)
- name: TC_GC_common.py
reason: Shared code for TC_GC, not a standalone test.
# Items below MUST be fixed eventually.
- name: TC_MCORE_FS_1_4.py
reason:
Very flaky in CI.
https://github.com/project-chip/connectedhomeip/issues/71932
- name: TC_PAVST_2_13.py
reason:
Used to be flaky, now it seems to deadlock and tests are cancelled.
https://github.com/project-chip/connectedhomeip/issues/71808

# This is a list of slow tests (just arbitrarily picked around 20 seconds)
# used in some script reporting for "be patient" messages as well as potentially
Expand Down
Loading