Remerge 0.16.x' into firmware21

1 files changed, 16 insertions, 0 deletions

diff --git a/lib/python/qmk/tests/test_cli_commands.py b/lib/python/qmk/tests/test_cli_commands.py
index 92ec879312..01db8aa6ec 100644
--- a/lib/python/qmk/tests/test_cli_commands.py
+++ b/lib/python/qmk/tests/test_cli_commands.py
@@ -113,7 +113,11 @@ def test_list_keymaps_community():
 
 
 def test_list_keymaps_kb_only():
+<<<<<<< HEAD
     result = check_subcommand('list-keymaps', '-kb', 'moonlander')
+=======
+    result = check_subcommand('list-keymaps', '-kb', 'contra')
+>>>>>>> qmk/master
     check_returncode(result)
     assert 'default' and 'oyrx' and 'webusb' in result.stdout
 
@@ -156,6 +160,18 @@ def test_json2c_stdin():
     assert result.stdout == '#include QMK_KEYBOARD_H\nconst uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {\t[0] = LAYOUT_ortho_1x1(KC_A)};\n\n'
 
 
+def test_json2c_wrong_json():
+    result = check_subcommand('json2c', 'keyboards/handwired/pytest/info.json')
+    check_returncode(result, [1])
+    assert 'Invalid JSON keymap' in result.stdout
+
+
+def test_json2c_no_json():
+    result = check_subcommand('json2c', 'keyboards/handwired/pytest/pytest.h')
+    check_returncode(result, [1])
+    assert 'Invalid JSON encountered' in result.stdout
+
+
 def test_info():
     result = check_subcommand('info', '-kb', 'handwired/pytest/basic')
     check_returncode(result)