Skip to content

Commit

Permalink
Fix test_json2c_no_json() (qmk#20756)
Browse files Browse the repository at this point in the history
  • Loading branch information
fauxpark committed May 6, 2023
1 parent dea9912 commit 578102b
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 16 deletions.
2 changes: 1 addition & 1 deletion keyboards/handwired/pytest/basic/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"layouts": {
"LAYOUT_custom": {
"layout": [
{ "label": "KC_Q", "matrix": [0, 0], "x": 0, "y": 0 }
{"label": "KC_Q", "matrix": [0, 0], "x": 0, "y": 0}
]
}
}
Expand Down
6 changes: 0 additions & 6 deletions keyboards/handwired/pytest/config.h

This file was deleted.

5 changes: 5 additions & 0 deletions keyboards/handwired/pytest/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@
"pid": "0x6465",
"device_version": "0.0.1"
},
"matrix_pins": {
"cols": ["F4"],
"rows": ["F5"]
},
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layout_aliases": {
Expand Down
14 changes: 7 additions & 7 deletions keyboards/handwired/pytest/macro/info.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"maintainer": "qmk",
"layouts": {
"LAYOUT_custom": {
"layout": [
{ "label": "KC_Q", "matrix": [0, 0], "x": 0, "y": 0 }
]
"maintainer": "qmk",
"layouts": {
"LAYOUT_custom": {
"layout": [
{"label": "KC_Q", "matrix": [0, 0], "x": 0, "y": 0}
]
}
}
}
}
2 changes: 1 addition & 1 deletion lib/python/qmk/tests/minimal_info.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"layouts": {
"LAYOUT": {
"layout": [
{ "label": "KC_A", "matrix": [0, 0], "x": 0, "y": 0 }
{"label": "KC_A", "matrix": [0, 0], "x": 0, "y": 0}
]
}
}
Expand Down
2 changes: 1 addition & 1 deletion lib/python/qmk/tests/test_cli_commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ def test_json2c_wrong_json():


def test_json2c_no_json():
result = check_subcommand('json2c', 'keyboards/handwired/pytest/config.h')
result = check_subcommand('json2c', 'keyboards/handwired/pytest/basic/keymaps/default/keymap.c')
check_returncode(result, [1])
assert 'Invalid JSON encountered' in result.stdout

Expand Down

0 comments on commit 578102b

Please sign in to comment.