drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

Merge remote-tracking branch 'origin/master' into develop

Browse source 
Resolved Conflicts:
	lib/python/qmk/tests/test_cli_commands.py
	util/install/fedora.sh
This commit is contained in:
Zach White 2021-05-19 15:49:11 -07:00
commit 6955c5a002
22 changed files with 70 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lib/python/qmk/tests/test_cli_commands.py
View file

@ -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