Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
QMK Bot 2022-07-23 16:42:55 +00:00
commit 8254d73fd4

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():