diff options
author | Zach White <skullydazed@gmail.com> | 2021-05-19 15:24:46 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-19 15:24:46 -0700 |
commit | db1eacdaacb9c8f6889f46bc1c6af155b81ad72a (patch) | |
tree | cd32a69a04c7ff93a11941d82aef3ce31c2b7523 /lib/python/qmk/tests | |
parent | a9aec546c873fa5a2cb1d9a10878aca71818b609 (diff) | |
download | qmk_firmware-db1eacdaacb9c8f6889f46bc1c6af155b81ad72a.tar.gz qmk_firmware-db1eacdaacb9c8f6889f46bc1c6af155b81ad72a.zip |
Align our subprocess usage with current best practices. (#12940)
* Align our subprocess usage with current best practices.
* remove unused import
* Apply suggestions from code review
Co-authored-by: Ryan <fauxpark@gmail.com>
* fix the cpp invocation for older python
* allow for unprompted installation
* make sure qmk new-keyboard works on windows
Co-authored-by: Ryan <fauxpark@gmail.com>
Diffstat (limited to 'lib/python/qmk/tests')
-rw-r--r-- | lib/python/qmk/tests/test_cli_commands.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/python/qmk/tests/test_cli_commands.py b/lib/python/qmk/tests/test_cli_commands.py index 741551e5e..d13e42d40 100644 --- a/lib/python/qmk/tests/test_cli_commands.py +++ b/lib/python/qmk/tests/test_cli_commands.py | |||
@@ -1,15 +1,14 @@ | |||
1 | import platform | 1 | import platform |
2 | from subprocess import DEVNULL | ||
2 | 3 | ||
3 | from subprocess import STDOUT, PIPE | 4 | from milc import cli |
4 | |||
5 | from qmk.commands import run | ||
6 | 5 | ||
7 | is_windows = 'windows' in platform.platform().lower() | 6 | is_windows = 'windows' in platform.platform().lower() |
8 | 7 | ||
9 | 8 | ||
10 | def check_subcommand(command, *args): | 9 | def check_subcommand(command, *args): |
11 | cmd = ['bin/qmk', command, *args] | 10 | cmd = ['bin/qmk', command, *args] |
12 | result = run(cmd, stdout=PIPE, stderr=STDOUT, universal_newlines=True) | 11 | result = cli.run(cmd, stdin=DEVNULL, combined_output=True) |
13 | return result | 12 | return result |
14 | 13 | ||
15 | 14 | ||
@@ -18,7 +17,7 @@ def check_subcommand_stdin(file_to_read, command, *args): | |||
18 | """ | 17 | """ |
19 | with open(file_to_read, encoding='utf-8') as my_file: | 18 | with open(file_to_read, encoding='utf-8') as my_file: |
20 | cmd = ['bin/qmk', command, *args] | 19 | cmd = ['bin/qmk', command, *args] |
21 | result = run(cmd, stdin=my_file, stdout=PIPE, stderr=STDOUT, universal_newlines=True) | 20 | result = cli.run(cmd, stdin=my_file, combined_output=True) |
22 | return result | 21 | return result |
23 | 22 | ||
24 | 23 | ||