darkkirb/qmk_firmware
1
0
Fork 0
forked from mirrors/qmk_firmware
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix test logic to check for both keymaps (#17761)

Browse source 
Python will evaluate first the left and then the right side of the and operator.

The left side would previously return True based on the truthiness logic that treats any non-emptry string as true.

It would not check if the desired keymap exists.

If the left side is true it will evaluate the right side which will check for the existance of a specific keymap.

With this change the check for existance of two keymaps is implemented.
This commit is contained in:
Niko Wenselowski 2022-07-23 18:42:19 +02:00 committed by GitHub
parent 2202efaf0c
commit 1f42a8ccdd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/python/qmk/tests/test_cli_commands.py
View file

@ -97,13 +97,15 @@ def test_list_keyboards():
def test_list_keymaps(): def test_list_keymaps():
result = check_subcommand('list-keymaps', '-kb', 'handwired/pytest/basic') result = check_subcommand('list-keymaps', '-kb', 'handwired/pytest/basic')
check_returncode(result) check_returncode(result)
assert 'default' and 'default_json' in result.stdout assert 'default' in result.stdout
assert 'default_json' in result.stdout
def test_list_keymaps_long(): def test_list_keymaps_long():
result = check_subcommand('list-keymaps', '--keyboard', 'handwired/pytest/basic') result = check_subcommand('list-keymaps', '--keyboard', 'handwired/pytest/basic')
check_returncode(result) check_returncode(result)
assert 'default' and 'default_json' in result.stdout assert 'default' in result.stdout
assert 'default_json' in result.stdout
def test_list_keymaps_community(): def test_list_keymaps_community():
@ -115,19 +117,22 @@ def test_list_keymaps_community():
def test_list_keymaps_kb_only(): def test_list_keymaps_kb_only():
result = check_subcommand('list-keymaps', '-kb', 'contra') result = check_subcommand('list-keymaps', '-kb', 'contra')
check_returncode(result) check_returncode(result)
assert 'default' and 'via' in result.stdout assert 'default' in result.stdout
assert 'via' in result.stdout
def test_list_keymaps_vendor_kb(): def test_list_keymaps_vendor_kb():
result = check_subcommand('list-keymaps', '-kb', 'ai03/lunar') result = check_subcommand('list-keymaps', '-kb', 'ai03/lunar')
check_returncode(result) check_returncode(result)
assert 'default' and 'via' in result.stdout assert 'default' in result.stdout
assert 'via' in result.stdout
def test_list_keymaps_vendor_kb_rev(): def test_list_keymaps_vendor_kb_rev():
result = check_subcommand('list-keymaps', '-kb', 'kbdfans/kbd67/mkiirgb/v2') result = check_subcommand('list-keymaps', '-kb', 'kbdfans/kbd67/mkiirgb/v2')
check_returncode(result) check_returncode(result)
assert 'default' and 'via' in result.stdout assert 'default' in result.stdout
assert 'via' in result.stdout
def test_list_keymaps_no_keyboard_found(): def test_list_keymaps_no_keyboard_found():