summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2022-07-23 16:42:55 +0000
committerQMK Bot <hello@qmk.fm>2022-07-23 16:42:55 +0000
commit8254d73fd441752b395830f29f8e051245c10b12 (patch)
treea1203e5e3d669cadaabf3b5cf9667dfd979235eb /lib
parentc586cfda48ff095d00b418aa7fc617435ac356a5 (diff)
parent1f42a8ccdd10a1f1ac1ed1a0ab62d2c9e5dc3ffa (diff)
downloadqmk_firmware-8254d73fd441752b395830f29f8e051245c10b12.tar.gz
qmk_firmware-8254d73fd441752b395830f29f8e051245c10b12.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'lib')
-rw-r--r--lib/python/qmk/tests/test_cli_commands.py15
1 files changed, 10 insertions, 5 deletions
diff --git a/lib/python/qmk/tests/test_cli_commands.py b/lib/python/qmk/tests/test_cli_commands.py
index 2463543ef1..fde8b079a3 100644
--- a/lib/python/qmk/tests/test_cli_commands.py
+++ b/lib/python/qmk/tests/test_cli_commands.py
@@ -97,13 +97,15 @@ def test_list_keyboards():
def test_list_keymaps():
result = check_subcommand('list-keymaps', '-kb', 'handwired/pytest/basic')
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():
result = check_subcommand('list-keymaps', '--keyboard', 'handwired/pytest/basic')
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():
@@ -115,19 +117,22 @@ def test_list_keymaps_community():
def test_list_keymaps_kb_only():
result = check_subcommand('list-keymaps', '-kb', 'contra')
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():
result = check_subcommand('list-keymaps', '-kb', 'ai03/lunar')
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():
result = check_subcommand('list-keymaps', '-kb', 'kbdfans/kbd67/mkiirgb/v2')
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():