diff options
Diffstat (limited to 'lib/python/qmk/tests/test_cli_commands.py')
| -rw-r--r-- | lib/python/qmk/tests/test_cli_commands.py | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/lib/python/qmk/tests/test_cli_commands.py b/lib/python/qmk/tests/test_cli_commands.py index 71830ce194..2f3d09723f 100644 --- a/lib/python/qmk/tests/test_cli_commands.py +++ b/lib/python/qmk/tests/test_cli_commands.py @@ -97,13 +97,15 @@ def test_list_keyboards(): def test_list_keymaps(): result = check_subcommand('list-keymaps', '-kb', 'handwired/pytest/basic') check_returncode(result) - assert 'default' and 'default_json' in result.stdout + assert 'default' in result.stdout + assert 'default_json' in result.stdout def test_list_keymaps_long(): result = check_subcommand('list-keymaps', '--keyboard', 'handwired/pytest/basic') check_returncode(result) - assert 'default' and 'default_json' in result.stdout + assert 'default' in result.stdout + assert 'default_json' in result.stdout def test_list_keymaps_community(): @@ -113,25 +115,24 @@ 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 + assert 'default' in result.stdout + assert 'oryx' in result.stdout def test_list_keymaps_vendor_kb(): result = check_subcommand('list-keymaps', '-kb', 'planck/ez') check_returncode(result) - assert 'default' and 'oryx' and 'webusb' in result.stdout + assert 'default' in result.stdout + assert 'oryx' in result.stdout -# def test_list_keymaps_vendor_kb_rev(): -# result = check_subcommand('list-keymaps', '-kb', 'kbdfans/kbd67/mkiirgb/v2') -# check_returncode(result) -# assert 'default' and 'via' in result.stdout +def test_list_keymaps_vendor_kb_rev(): + result = check_subcommand('list-keymaps', '-kb', 'kbdfans/kbd67/mkiirgb/v2') + check_returncode(result) + assert 'default' in result.stdout + assert 'oryx' in result.stdout def test_list_keymaps_no_keyboard_found(): @@ -263,7 +264,6 @@ 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 pytest' in result.stdout |