shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-06 17:18:12 +03:00
Code

test-network: merge stdout and stderr of invoked command by call()

Browse Source 
Otherwise, the logs may be messed up.
This commit is contained in:
Yu Watanabe 2022-07-11 22:31:12 +02:00
parent 90bc309aa2
commit b5dac5b0de
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/test-network/systemd-networkd-tests.py
View File

@ -97,9 +97,9 @@ def check_output(*command, text=True, **kwargs):
return subprocess.run(command, check=True, universal_newlines=text, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, **kwargs).stdout.rstrip()
def call(*command, text=True, **kwargs):
# This returns returncode. stdout and stderr are shown in console
# This returns returncode. stdout and stderr are merged and shown in console
command = command[0].split() + list(command[1:])
return subprocess.run(command, check=False, universal_newlines=text, **kwargs).returncode
return subprocess.run(command, check=False, universal_newlines=text, stderr=subprocess.STDOUT, **kwargs).returncode
def call_quiet(*command, text=True, **kwargs):
command = command[0].split() + list(command[1:])