From db1eacdaacb9c8f6889f46bc1c6af155b81ad72a Mon Sep 17 00:00:00 2001
From: Zach White <skullydazed@gmail.com>
Date: Wed, 19 May 2021 15:24:46 -0700
Subject: 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>
---
lib/python/qmk/tests/test_cli_commands.py | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
(limited to 'lib/python/qmk/tests')
diff --git a/lib/python/qmk/tests/test_cli_commands.py b/lib/python/qmk/tests/test_cli_commands.py
index 741551e5ec..d13e42d408 100644
--- a/lib/python/qmk/tests/test_cli_commands.py
+++ b/lib/python/qmk/tests/test_cli_commands.py
@@ -1,15 +1,14 @@
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
@@ -18,7 +17,7 @@ def check_subcommand_stdin(file_to_read, command, *args):
"""
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
--
cgit v1.2.3