Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix manual code processing in Python matter_testing_support #27558

Merged
merged 1 commit into from
Jun 29, 2023
Merged

Fix manual code processing in Python matter_testing_support #27558

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 6 additions & 5 deletions src/python_testing/matter_testing_support.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -574,14 +574,15 @@ def byte_string_from_hex(s: str) -> bytes:
return unhexlify(s.replace(":", "").replace(" ", "").replace("0x", ""))


def int_from_manual_code(s: str) -> int:
s = s.replace('-', '')
def str_from_manual_code(s: str) -> str:
"""Enforces legal format for manual codes and removes spaces/dashes."""
s = s.replace("-", "").replace(" ", "")
regex = r"^([0-9]{11}|[0-9]{21})$"
match = re.match(regex, s)
if not match:
raise ValueError("Invalid manual code format, does not match %s" % regex)

return int(s, 10)
return s


def int_named_arg(s: str) -> Tuple[str, int]:
Expand Down Expand Up @@ -701,7 +702,7 @@ def populate_commissioning_args(args: argparse.Namespace, config: MatterTestConf
# TODO: this should also allow multiple once QR and manual codes are supported.
config.qr_code_content = args.qr_code
if args.manual_code:
config.manual_code = "%d" % args.manual_code
config.manual_code = args.manual_code
else:
config.manual_code = None

Expand Down Expand Up @@ -885,7 +886,7 @@ def parse_matter_test_args(argv: List[str]) -> MatterTestConfig:

code_group.add_argument('-q', '--qr-code', type=str,
metavar="QR_CODE", help="QR setup code content (overrides passcode and discriminator)")
code_group.add_argument('--manual-code', type=int_from_manual_code,
code_group.add_argument('--manual-code', type=str_from_manual_code,
metavar="MANUAL_CODE", help="Manual setup code content (overrides passcode and discriminator)")

fabric_group = parser.add_argument_group(
Expand Down