From b5dac5b0de69d748fc1e58936b64e2e4745a83f2 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 11 Jul 2022 22:31:12 +0200 Subject: [PATCH] test-network: merge stdout and stderr of invoked command by call() Otherwise, the logs may be messed up. --- test/test-network/systemd-networkd-tests.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index 1e78b966aa2..a7ac4dbec58 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -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:]) -- 2.47.3