Merge upstream QMK Firmware at '0.12.52~1'
This commit is contained in:
Drashna Jael're
13
lib/python/qmk/tests/minimal_info.json
Normal file
13
lib/python/qmk/tests/minimal_info.json
Normal file
@@ -0,0 +1,13 @@
|
||||
{
|
||||
"keyboard_name": "tester",
|
||||
"maintainer": "qmk",
|
||||
"height": 5,
|
||||
"width": 15,
|
||||
"layouts": {
|
||||
"LAYOUT": {
|
||||
"layout": [
|
||||
{ "label": "KC_A", "x": 0, "y": 0, "matrix": [0, 0] }
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
7
lib/python/qmk/tests/minimal_keymap.json
Normal file
7
lib/python/qmk/tests/minimal_keymap.json
Normal file
@@ -0,0 +1,7 @@
|
||||
{
|
||||
"keyboard": "handwired/pytest/basic",
|
||||
"keymap": "test",
|
||||
"layers": [["KC_A"]],
|
||||
"layout": "LAYOUT_ortho_1x1",
|
||||
"version": 1
|
||||
}
|
||||
@@ -1,24 +1,23 @@
|
||||
import platform
|
||||
from subprocess import DEVNULL
|
||||
|
||||
from subprocess import STDOUT, PIPE
|
||||
|
||||
from qmk.commands import run
|
||||
from milc import cli
|
||||
|
||||
is_windows = 'windows' in platform.platform().lower()
|
||||
|
||||
|
||||
def check_subcommand(command, *args):
|
||||
cmd = ['bin/qmk', command, *args]
|
||||
result = run(cmd, stdout=PIPE, stderr=STDOUT, universal_newlines=True)
|
||||
result = cli.run(cmd, stdin=DEVNULL, combined_output=True)
|
||||
return result
|
||||
|
||||
|
||||
def check_subcommand_stdin(file_to_read, command, *args):
|
||||
"""Pipe content of a file to a command and return output.
|
||||
"""
|
||||
with open(file_to_read) as my_file:
|
||||
with open(file_to_read, encoding='utf-8') as my_file:
|
||||
cmd = ['bin/qmk', command, *args]
|
||||
result = run(cmd, stdin=my_file, stdout=PIPE, stderr=STDOUT, universal_newlines=True)
|
||||
result = cli.run(cmd, stdin=my_file, combined_output=True)
|
||||
return result
|
||||
|
||||
|
||||
@@ -33,22 +32,27 @@ def check_returncode(result, expected=[0]):
|
||||
|
||||
|
||||
def test_cformat():
|
||||
result = check_subcommand('cformat', 'quantum/matrix.c')
|
||||
result = check_subcommand('cformat', '-n', 'quantum/matrix.c')
|
||||
check_returncode(result)
|
||||
|
||||
|
||||
def test_cformat_all():
|
||||
result = check_subcommand('cformat', '-n', '-a')
|
||||
check_returncode(result, [0, 1])
|
||||
|
||||
|
||||
def test_compile():
|
||||
result = check_subcommand('compile', '-kb', 'handwired/onekey/pytest', '-km', 'default', '-n')
|
||||
result = check_subcommand('compile', '-kb', 'handwired/pytest/basic', '-km', 'default', '-n')
|
||||
check_returncode(result)
|
||||
|
||||
|
||||
def test_compile_json():
|
||||
result = check_subcommand('compile', '-kb', 'handwired/onekey/pytest', '-km', 'default_json')
|
||||
result = check_subcommand('compile', '-kb', 'handwired/pytest/basic', '-km', 'default_json', '-n')
|
||||
check_returncode(result)
|
||||
|
||||
|
||||
def test_flash():
|
||||
result = check_subcommand('flash', '-kb', 'handwired/onekey/pytest', '-km', 'default', '-n')
|
||||
result = check_subcommand('flash', '-kb', 'handwired/pytest/basic', '-km', 'default', '-n')
|
||||
check_returncode(result)
|
||||
|
||||
|
||||
@@ -57,12 +61,6 @@ def test_flash_bootloaders():
|
||||
check_returncode(result, [1])
|
||||
|
||||
|
||||
def test_config():
|
||||
result = check_subcommand('config')
|
||||
check_returncode(result)
|
||||
assert 'general.color' in result.stdout
|
||||
|
||||
|
||||
def test_kle2json():
|
||||
result = check_subcommand('kle2json', 'lib/python/qmk/tests/kle.txt', '-f')
|
||||
check_returncode(result)
|
||||
@@ -83,29 +81,35 @@ def test_hello():
|
||||
|
||||
|
||||
def test_pyformat():
|
||||
result = check_subcommand('pyformat')
|
||||
result = check_subcommand('pyformat', '--dry-run')
|
||||
check_returncode(result)
|
||||
assert 'Successfully formatted the python code' in result.stdout
|
||||
assert 'Python code in `bin/qmk` and `lib/python` is correctly formatted.' in result.stdout
|
||||
|
||||
|
||||
def test_list_keyboards():
|
||||
result = check_subcommand('list-keyboards')
|
||||
check_returncode(result)
|
||||
# check to see if a known keyboard is returned
|
||||
# this will fail if handwired/onekey/pytest is removed
|
||||
assert 'handwired/onekey/pytest' in result.stdout
|
||||
# this will fail if handwired/pytest/basic is removed
|
||||
assert 'handwired/pytest/basic' in result.stdout
|
||||
|
||||
|
||||
def test_list_keymaps():
|
||||
result = check_subcommand('list-keymaps', '-kb', 'handwired/onekey/pytest')
|
||||
result = check_subcommand('list-keymaps', '-kb', 'handwired/pytest/basic')
|
||||
check_returncode(result)
|
||||
assert 'default' and 'test' in result.stdout
|
||||
assert 'default' and 'default_json' in result.stdout
|
||||
|
||||
|
||||
def test_list_keymaps_long():
|
||||
result = check_subcommand('list-keymaps', '--keyboard', 'handwired/onekey/pytest')
|
||||
result = check_subcommand('list-keymaps', '--keyboard', 'handwired/pytest/basic')
|
||||
check_returncode(result)
|
||||
assert 'default' and 'test' in result.stdout
|
||||
assert 'default' and 'default_json' in result.stdout
|
||||
|
||||
|
||||
def test_list_keymaps_community():
|
||||
result = check_subcommand('list-keymaps', '--keyboard', 'handwired/pytest/has_community')
|
||||
check_returncode(result)
|
||||
assert 'test' in result.stdout
|
||||
|
||||
|
||||
def test_list_keymaps_kb_only():
|
||||
@@ -128,45 +132,45 @@ def test_list_keymaps_vendor_kb_rev():
|
||||
|
||||
def test_list_keymaps_no_keyboard_found():
|
||||
result = check_subcommand('list-keymaps', '-kb', 'asdfghjkl')
|
||||
check_returncode(result, [1])
|
||||
assert 'does not exist' in result.stdout
|
||||
check_returncode(result, [2])
|
||||
assert 'invalid keyboard_folder value' in result.stdout
|
||||
|
||||
|
||||
def test_json2c():
|
||||
result = check_subcommand('json2c', 'keyboards/handwired/onekey/keymaps/default_json/keymap.json')
|
||||
result = check_subcommand('json2c', 'keyboards/handwired/pytest/has_template/keymaps/default_json/keymap.json')
|
||||
check_returncode(result)
|
||||
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_stdin():
|
||||
result = check_subcommand_stdin('keyboards/handwired/onekey/keymaps/default_json/keymap.json', 'json2c', '-')
|
||||
result = check_subcommand_stdin('keyboards/handwired/pytest/has_template/keymaps/default_json/keymap.json', 'json2c', '-')
|
||||
check_returncode(result)
|
||||
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_info():
|
||||
result = check_subcommand('info', '-kb', 'handwired/onekey/pytest')
|
||||
result = check_subcommand('info', '-kb', 'handwired/pytest/basic')
|
||||
check_returncode(result)
|
||||
assert 'Keyboard Name: handwired/onekey/pytest' in result.stdout
|
||||
assert 'Processor: STM32F303' in result.stdout
|
||||
assert 'Keyboard Name: handwired/pytest/basic' in result.stdout
|
||||
assert 'Processor: atmega32u4' in result.stdout
|
||||
assert 'Layout:' not in result.stdout
|
||||
assert 'k0' not in result.stdout
|
||||
|
||||
|
||||
def test_info_keyboard_render():
|
||||
result = check_subcommand('info', '-kb', 'handwired/onekey/pytest', '-l')
|
||||
result = check_subcommand('info', '-kb', 'handwired/pytest/basic', '-l')
|
||||
check_returncode(result)
|
||||
assert 'Keyboard Name: handwired/onekey/pytest' in result.stdout
|
||||
assert 'Processor: STM32F303' in result.stdout
|
||||
assert 'Keyboard Name: handwired/pytest/basic' in result.stdout
|
||||
assert 'Processor: atmega32u4' in result.stdout
|
||||
assert 'Layouts:' in result.stdout
|
||||
assert 'k0' in result.stdout
|
||||
|
||||
|
||||
def test_info_keymap_render():
|
||||
result = check_subcommand('info', '-kb', 'handwired/onekey/pytest', '-km', 'default_json')
|
||||
result = check_subcommand('info', '-kb', 'handwired/pytest/basic', '-km', 'default_json')
|
||||
check_returncode(result)
|
||||
assert 'Keyboard Name: handwired/onekey/pytest' in result.stdout
|
||||
assert 'Processor: STM32F303' in result.stdout
|
||||
assert 'Keyboard Name: handwired/pytest/basic' in result.stdout
|
||||
assert 'Processor: atmega32u4' in result.stdout
|
||||
|
||||
if is_windows:
|
||||
assert '|A |' in result.stdout
|
||||
@@ -175,10 +179,10 @@ def test_info_keymap_render():
|
||||
|
||||
|
||||
def test_info_matrix_render():
|
||||
result = check_subcommand('info', '-kb', 'handwired/onekey/pytest', '-m')
|
||||
result = check_subcommand('info', '-kb', 'handwired/pytest/basic', '-m')
|
||||
check_returncode(result)
|
||||
assert 'Keyboard Name: handwired/onekey/pytest' in result.stdout
|
||||
assert 'Processor: STM32F303' in result.stdout
|
||||
assert 'Keyboard Name: handwired/pytest/basic' in result.stdout
|
||||
assert 'Processor: atmega32u4' in result.stdout
|
||||
assert 'LAYOUT_ortho_1x1' in result.stdout
|
||||
|
||||
if is_windows:
|
||||
@@ -190,27 +194,27 @@ def test_info_matrix_render():
|
||||
|
||||
|
||||
def test_c2json():
|
||||
result = check_subcommand("c2json", "-kb", "handwired/onekey/pytest", "-km", "default", "keyboards/handwired/onekey/keymaps/default/keymap.c")
|
||||
result = check_subcommand("c2json", "-kb", "handwired/pytest/has_template", "-km", "default", "keyboards/handwired/pytest/has_template/keymaps/default/keymap.c")
|
||||
check_returncode(result)
|
||||
assert result.stdout.strip() == '{"keyboard": "handwired/onekey/pytest", "documentation": "This file is a keymap.json file for handwired/onekey/pytest", "keymap": "default", "layout": "LAYOUT_ortho_1x1", "layers": [["KC_A"]]}'
|
||||
assert result.stdout.strip() == '{"keyboard": "handwired/pytest/has_template", "documentation": "This file is a keymap.json file for handwired/pytest/has_template", "keymap": "default", "layout": "LAYOUT_ortho_1x1", "layers": [["KC_A"]]}'
|
||||
|
||||
|
||||
def test_c2json_nocpp():
|
||||
result = check_subcommand("c2json", "--no-cpp", "-kb", "handwired/onekey/pytest", "-km", "default", "keyboards/handwired/onekey/keymaps/pytest_nocpp/keymap.c")
|
||||
result = check_subcommand("c2json", "--no-cpp", "-kb", "handwired/pytest/has_template", "-km", "default", "keyboards/handwired/pytest/has_template/keymaps/nocpp/keymap.c")
|
||||
check_returncode(result)
|
||||
assert result.stdout.strip() == '{"keyboard": "handwired/onekey/pytest", "documentation": "This file is a keymap.json file for handwired/onekey/pytest", "keymap": "default", "layout": "LAYOUT", "layers": [["KC_ENTER"]]}'
|
||||
assert result.stdout.strip() == '{"keyboard": "handwired/pytest/has_template", "documentation": "This file is a keymap.json file for handwired/pytest/has_template", "keymap": "default", "layout": "LAYOUT", "layers": [["KC_ENTER"]]}'
|
||||
|
||||
|
||||
def test_c2json_stdin():
|
||||
result = check_subcommand_stdin("keyboards/handwired/onekey/keymaps/default/keymap.c", "c2json", "-kb", "handwired/onekey/pytest", "-km", "default", "-")
|
||||
result = check_subcommand_stdin("keyboards/handwired/pytest/has_template/keymaps/default/keymap.c", "c2json", "-kb", "handwired/pytest/has_template", "-km", "default", "-")
|
||||
check_returncode(result)
|
||||
assert result.stdout.strip() == '{"keyboard": "handwired/onekey/pytest", "documentation": "This file is a keymap.json file for handwired/onekey/pytest", "keymap": "default", "layout": "LAYOUT_ortho_1x1", "layers": [["KC_A"]]}'
|
||||
assert result.stdout.strip() == '{"keyboard": "handwired/pytest/has_template", "documentation": "This file is a keymap.json file for handwired/pytest/has_template", "keymap": "default", "layout": "LAYOUT_ortho_1x1", "layers": [["KC_A"]]}'
|
||||
|
||||
|
||||
def test_c2json_nocpp_stdin():
|
||||
result = check_subcommand_stdin("keyboards/handwired/onekey/keymaps/pytest_nocpp/keymap.c", "c2json", "--no-cpp", "-kb", "handwired/onekey/pytest", "-km", "default", "-")
|
||||
result = check_subcommand_stdin("keyboards/handwired/pytest/has_template/keymaps/nocpp/keymap.c", "c2json", "--no-cpp", "-kb", "handwired/pytest/has_template", "-km", "default", "-")
|
||||
check_returncode(result)
|
||||
assert result.stdout.strip() == '{"keyboard": "handwired/onekey/pytest", "documentation": "This file is a keymap.json file for handwired/onekey/pytest", "keymap": "default", "layout": "LAYOUT", "layers": [["KC_ENTER"]]}'
|
||||
assert result.stdout.strip() == '{"keyboard": "handwired/pytest/has_template", "documentation": "This file is a keymap.json file for handwired/pytest/has_template", "keymap": "default", "layout": "LAYOUT", "layers": [["KC_ENTER"]]}'
|
||||
|
||||
|
||||
def test_clean():
|
||||
@@ -219,8 +223,66 @@ def test_clean():
|
||||
assert result.stdout.count('done') == 2
|
||||
|
||||
|
||||
def test_generate_api():
|
||||
result = check_subcommand('generate-api', '--dry-run')
|
||||
check_returncode(result)
|
||||
|
||||
|
||||
def test_generate_rgb_breathe_table():
|
||||
result = check_subcommand("generate-rgb-breathe-table", "-c", "1.2", "-m", "127")
|
||||
check_returncode(result)
|
||||
assert 'Breathing center: 1.2' in result.stdout
|
||||
assert 'Breathing max: 127' in result.stdout
|
||||
|
||||
|
||||
def test_generate_config_h():
|
||||
result = check_subcommand('generate-config-h', '-kb', 'handwired/pytest/basic')
|
||||
check_returncode(result)
|
||||
assert '# define DEVICE_VER 0x0001' in result.stdout
|
||||
assert '# define DESCRIPTION handwired/pytest/basic' in result.stdout
|
||||
assert '# define DIODE_DIRECTION COL2ROW' in result.stdout
|
||||
assert '# define MANUFACTURER none' in result.stdout
|
||||
assert '# define PRODUCT handwired/pytest/basic' in result.stdout
|
||||
assert '# define PRODUCT_ID 0x6465' in result.stdout
|
||||
assert '# define VENDOR_ID 0xFEED' in result.stdout
|
||||
assert '# define MATRIX_COLS 1' in result.stdout
|
||||
assert '# define MATRIX_COL_PINS { F4 }' in result.stdout
|
||||
assert '# define MATRIX_ROWS 1' in result.stdout
|
||||
assert '# define MATRIX_ROW_PINS { F5 }' in result.stdout
|
||||
|
||||
|
||||
def test_generate_rules_mk():
|
||||
result = check_subcommand('generate-rules-mk', '-kb', 'handwired/pytest/basic')
|
||||
check_returncode(result)
|
||||
assert 'BOOTLOADER ?= atmel-dfu' in result.stdout
|
||||
assert 'MCU ?= atmega32u4' in result.stdout
|
||||
|
||||
|
||||
def test_generate_layouts():
|
||||
result = check_subcommand('generate-layouts', '-kb', 'handwired/pytest/basic')
|
||||
check_returncode(result)
|
||||
assert '#define LAYOUT_custom(k0A) {' in result.stdout
|
||||
|
||||
|
||||
def test_format_json_keyboard():
|
||||
result = check_subcommand('format-json', '--format', 'keyboard', 'lib/python/qmk/tests/minimal_info.json')
|
||||
check_returncode(result)
|
||||
assert result.stdout == '{\n "keyboard_name": "tester",\n "maintainer": "qmk",\n "height": 5,\n "width": 15,\n "layouts": {\n "LAYOUT": {\n "layout": [\n { "label": "KC_A", "matrix": [0, 0], "x": 0, "y": 0 }\n ]\n }\n }\n}\n'
|
||||
|
||||
|
||||
def test_format_json_keymap():
|
||||
result = check_subcommand('format-json', '--format', 'keymap', 'lib/python/qmk/tests/minimal_keymap.json')
|
||||
check_returncode(result)
|
||||
assert result.stdout == '{\n "version": 1,\n "keyboard": "handwired/pytest/basic",\n "keymap": "test",\n "layout": "LAYOUT_ortho_1x1",\n "layers": [\n [\n "KC_A"\n ]\n ]\n}\n'
|
||||
|
||||
|
||||
def test_format_json_keyboard_auto():
|
||||
result = check_subcommand('format-json', '--format', 'auto', 'lib/python/qmk/tests/minimal_info.json')
|
||||
check_returncode(result)
|
||||
assert result.stdout == '{\n "keyboard_name": "tester",\n "maintainer": "qmk",\n "height": 5,\n "width": 15,\n "layouts": {\n "LAYOUT": {\n "layout": [\n { "label": "KC_A", "matrix": [0, 0], "x": 0, "y": 0 }\n ]\n }\n }\n}\n'
|
||||
|
||||
|
||||
def test_format_json_keymap_auto():
|
||||
result = check_subcommand('format-json', '--format', 'auto', 'lib/python/qmk/tests/minimal_keymap.json')
|
||||
check_returncode(result)
|
||||
assert result.stdout == '{\n "keyboard": "handwired/pytest/basic",\n "keymap": "test",\n "layers": [\n ["KC_A"]\n ],\n "layout": "LAYOUT_ortho_1x1",\n "version": 1\n}\n'
|
||||
|
||||
@@ -1,38 +1,38 @@
|
||||
import qmk.keymap
|
||||
|
||||
|
||||
def test_template_c_onekey_proton_c():
|
||||
templ = qmk.keymap.template_c('handwired/onekey/proton_c')
|
||||
def test_template_c_pytest_basic():
|
||||
templ = qmk.keymap.template_c('handwired/pytest/basic')
|
||||
assert templ == qmk.keymap.DEFAULT_KEYMAP_C
|
||||
|
||||
|
||||
def test_template_json_onekey_proton_c():
|
||||
templ = qmk.keymap.template_json('handwired/onekey/proton_c')
|
||||
assert templ == {'keyboard': 'handwired/onekey/proton_c'}
|
||||
def test_template_json_pytest_basic():
|
||||
templ = qmk.keymap.template_json('handwired/pytest/basic')
|
||||
assert templ == {'keyboard': 'handwired/pytest/basic'}
|
||||
|
||||
|
||||
def test_template_c_onekey_pytest():
|
||||
templ = qmk.keymap.template_c('handwired/onekey/pytest')
|
||||
def test_template_c_pytest_has_template():
|
||||
templ = qmk.keymap.template_c('handwired/pytest/has_template')
|
||||
assert templ == '#include QMK_KEYBOARD_H\nconst uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {__KEYMAP_GOES_HERE__};\n'
|
||||
|
||||
|
||||
def test_template_json_onekey_pytest():
|
||||
templ = qmk.keymap.template_json('handwired/onekey/pytest')
|
||||
assert templ == {'keyboard': 'handwired/onekey/pytest', "documentation": "This file is a keymap.json file for handwired/onekey/pytest"}
|
||||
def test_template_json_pytest_has_template():
|
||||
templ = qmk.keymap.template_json('handwired/pytest/has_template')
|
||||
assert templ == {'keyboard': 'handwired/pytest/has_template', "documentation": "This file is a keymap.json file for handwired/pytest/has_template"}
|
||||
|
||||
|
||||
def test_generate_c_onekey_pytest():
|
||||
templ = qmk.keymap.generate_c('handwired/onekey/pytest', 'LAYOUT', [['KC_A']])
|
||||
def test_generate_c_pytest_has_template():
|
||||
templ = qmk.keymap.generate_c('handwired/pytest/has_template', 'LAYOUT', [['KC_A']])
|
||||
assert templ == '#include QMK_KEYBOARD_H\nconst uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {\t[0] = LAYOUT(KC_A)};\n'
|
||||
|
||||
|
||||
def test_generate_json_onekey_pytest():
|
||||
templ = qmk.keymap.generate_json('default', 'handwired/onekey/pytest', 'LAYOUT', [['KC_A']])
|
||||
assert templ == {"keyboard": "handwired/onekey/pytest", "documentation": "This file is a keymap.json file for handwired/onekey/pytest", "keymap": "default", "layout": "LAYOUT", "layers": [["KC_A"]]}
|
||||
def test_generate_json_pytest_has_template():
|
||||
templ = qmk.keymap.generate_json('default', 'handwired/pytest/has_template', 'LAYOUT', [['KC_A']])
|
||||
assert templ == {"keyboard": "handwired/pytest/has_template", "documentation": "This file is a keymap.json file for handwired/pytest/has_template", "keymap": "default", "layout": "LAYOUT", "layers": [["KC_A"]]}
|
||||
|
||||
|
||||
def test_parse_keymap_c():
|
||||
parsed_keymap_c = qmk.keymap.parse_keymap_c('keyboards/handwired/onekey/keymaps/default/keymap.c')
|
||||
parsed_keymap_c = qmk.keymap.parse_keymap_c('keyboards/handwired/pytest/basic/keymaps/default/keymap.c')
|
||||
assert parsed_keymap_c == {'layers': [{'name': '0', 'layout': 'LAYOUT_ortho_1x1', 'keycodes': ['KC_A']}]}
|
||||
|
||||
|
||||
|
||||
@@ -4,9 +4,9 @@ from pathlib import Path
|
||||
import qmk.path
|
||||
|
||||
|
||||
def test_keymap_onekey_pytest():
|
||||
path = qmk.path.keymap('handwired/onekey/pytest')
|
||||
assert path.samefile('keyboards/handwired/onekey/keymaps')
|
||||
def test_keymap_pytest_basic():
|
||||
path = qmk.path.keymap('handwired/pytest/basic')
|
||||
assert path.samefile('keyboards/handwired/pytest/basic/keymaps')
|
||||
|
||||
|
||||
def test_normpath():
|
||||
|
||||
Reference in New Issue
Block a user