qmk_firmware

commit 578102b40056693de8a92b49cd0c48e51ff4ad4a
parent dea9912cc996053e659be679c61f55c4bf46deda
Author: Ryan <fauxpark@gmail.com>
Date:   Sat,  6 May 2023 23:00:27 +1000

Fix `test_json2c_no_json()` (#20756)


Diffstat:
M
keyboards/handwired/pytest/basic/info.json
 | 
2
+-
D
keyboards/handwired/pytest/config.h
 | 
6
------
M
keyboards/handwired/pytest/info.json
 | 
5
+++++
M
keyboards/handwired/pytest/macro/info.json
 | 
14
+++++++-------
M
lib/python/qmk/tests/minimal_info.json
 | 
2
+-
M
lib/python/qmk/tests/test_cli_commands.py
 | 
2
+-

6 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/keyboards/handwired/pytest/basic/info.json b/keyboards/handwired/pytest/basic/info.json
@@ -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}
             ]
         }
     }
diff --git a/keyboards/handwired/pytest/config.h b/keyboards/handwired/pytest/config.h
@@ -1,6 +0,0 @@
-#pragma once
-
-
-#define MATRIX_COL_PINS { F4 }
-#define MATRIX_ROW_PINS { F5 }
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/pytest/info.json b/keyboards/handwired/pytest/info.json
@@ -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": {
diff --git a/keyboards/handwired/pytest/macro/info.json b/keyboards/handwired/pytest/macro/info.json
@@ -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}
+            ]
+        }
     }
-  }
 }
diff --git a/lib/python/qmk/tests/minimal_info.json b/lib/python/qmk/tests/minimal_info.json
@@ -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}
             ]
         }
     }
diff --git a/lib/python/qmk/tests/test_cli_commands.py b/lib/python/qmk/tests/test_cli_commands.py
@@ -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