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

2021-03-24 16:27:28 +00:00
parent 743d6c430b 299008be36
commit 0dc0516f0c
18 changed files with 614 additions and 106 deletions
--- a/lib/python/qmk/tests/test_cli_commands.py
+++ b/lib/python/qmk/tests/test_cli_commands.py
@ -134,8 +134,8 @@ def test_list_keymaps_vendor_kb_rev():

 def test_list_keymaps_no_keyboard_found():
    result = check_subcommand('list-keymaps', '-kb', 'asdfghjkl')
-    check_returncode(result, [1])
-    assert 'does not exist' in result.stdout
+    check_returncode(result, [2])
+    assert 'invalid keyboard_folder value' in result.stdout


 def test_json2c():