Skip to content

Commit bcdabaa

Browse files
committed
Fix some tests using removed class member
1 parent 490f27b commit bcdabaa

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

src/controller/python/chip/native/__init__.py

+4
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,10 @@ def raise_on_error(self) -> None:
8888
if exception is not None: # Ensure exception is not None to avoid mypy error and only raise valid exceptions
8989
raise exception
9090

91+
@classmethod
92+
def from_code(cls, code):
93+
return cls(code=code, line=0, file=ctypes.c_void_p())
94+
9195
@property
9296
def is_success(self) -> bool:
9397
return self.code == 0

src/python_testing/TC_CADMIN_1_9.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
from chip import ChipDeviceCtrl
3232
from chip.ChipDeviceCtrl import CommissioningParameters
3333
from chip.exceptions import ChipStackError
34+
from chip.native import PyChipError
3435
from matter_testing_support import MatterBaseTest, TestStep, async_test_body, default_matter_test_main
3536
from mobly import asserts
3637

@@ -74,7 +75,7 @@ async def CommissionOnNetwork(
7475
await self.th2.CommissionOnNetwork(
7576
nodeId=self.dut_node_id, setupPinCode=setup_code,
7677
filterType=ChipDeviceCtrl.DiscoveryFilterType.LONG_DISCRIMINATOR, filter=self.discriminator)
77-
errcode = ctx.exception.chip_error
78+
errcode = PyChipError.from_code(ctx.exception.err)
7879
return errcode
7980

8081
async def CommissionAttempt(

src/python_testing/TC_CGEN_2_4.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
from chip import ChipDeviceCtrl
3939
from chip.ChipDeviceCtrl import CommissioningParameters
4040
from chip.exceptions import ChipStackError
41+
from chip.native import PyChipError
4142
from matter_testing_support import MatterBaseTest, async_test_body, default_matter_test_main
4243
from mobly import asserts
4344

@@ -78,7 +79,7 @@ async def CommissionToStageSendCompleteAndCleanup(
7879
await self.th2.CommissionOnNetwork(
7980
nodeId=self.dut_node_id, setupPinCode=params.setupPinCode,
8081
filterType=ChipDeviceCtrl.DiscoveryFilterType.LONG_DISCRIMINATOR, filter=self.discriminator)
81-
errcode = ctx.exception.chip_error
82+
errcode = PyChipError.from_code(ctx.exception.err)
8283
asserts.assert_true(errcode.sdk_part == expectedErrorPart, 'Unexpected error type returned from CommissioningComplete')
8384
asserts.assert_true(errcode.sdk_code == expectedErrCode, 'Unexpected error code returned from CommissioningComplete')
8485
revokeCmd = Clusters.AdministratorCommissioning.Commands.RevokeCommissioning()

0 commit comments

Comments
 (0)