Cutieguwu/qmk_firmware-mirror
1
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2026-08-04 08:21:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
QMK Bot
2023-05-06 13:01:11 +00:00
parent b110087a72 578102b400
commit 179587a8b8
6 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/python/qmk/tests/minimal_info.json
+1 -1
View File
@@ -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}
]
}
}
lib/python/qmk/tests/test_cli_commands.py
+1 -1
View File
@@ -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