diff options
| author | Zach White <[email protected]> | 2021-05-19 15:49:11 -0700 | 
|---|---|---|
| committer | Zach White <[email protected]> | 2021-05-19 15:49:11 -0700 | 
| commit | 6955c5a00295382d3b4151a840aa5c929cd98059 (patch) | |
| tree | 26109c4ed2a266650fc5fad19ce5f784bc7c346b /lib/python/qmk/tests/test_cli_commands.py | |
| parent | 82aa9ad4a567695d1f7d0b1e36bf8563d2967813 (diff) | |
| parent | db1eacdaacb9c8f6889f46bc1c6af155b81ad72a (diff) | |
| download | qmk_firmware-6955c5a00295382d3b4151a840aa5c929cd98059.tar.gz qmk_firmware-6955c5a00295382d3b4151a840aa5c929cd98059.zip | |
Merge remote-tracking branch 'origin/master' into develop
Resolved Conflicts:
	lib/python/qmk/tests/test_cli_commands.py
	util/install/fedora.sh
Diffstat (limited to 'lib/python/qmk/tests/test_cli_commands.py')
| -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 6730f9c9f8..afdbc81429 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 = ['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 = ['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 | 
