Fix commandline parsing and flake8 findings, rebase

Fixed commandline and config parsing. Thx @xplusplus.
Rebased on master and fixed merge conflicts.

1 files changed, 8 insertions, 1 deletions

diff --git a/lib/python/qmk/tests/test_cli_commands.py b/lib/python/qmk/tests/test_cli_commands.py
index 7dc51d247..d88437903 100644
--- a/lib/python/qmk/tests/test_cli_commands.py
+++ b/lib/python/qmk/tests/test_cli_commands.py
@@ -55,7 +55,14 @@ def test_list_keyboards():
     # this will fail if handwired/onekey/pytest is removed
     assert 'handwired/onekey/pytest' in result.stdout
 
+
 def test_list_keymaps():
-    result = check_subcommand("list_keymaps", "-kb", "planck/ez")
+    result = check_subcommand("list-keymaps", "-kb", "planck/ez")
     assert result.returncode == 0
     assert "planck/ez:default" and "planck/ez:drashna" in result.stdout
+
+
+def test_list_keymaps_no_keyboard_found():
+    result = check_subcommand("list-keymaps", "-kb", "asdfghjkl")
+    assert result.returncode == 0
+    assert "does not exist" in result.stdout