diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index 1e78b966aa..7a791af003 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:]) @@ -431,7 +431,7 @@ def flush_routing_policy_rules(): have = True print(f'### Removing IPv{ipv} routing policy rules that did not exist when the test started.') print(f'# {line}') - words = line.split() + words = line.replace('lookup [l3mdev-table]', 'l3mdev').split() priority = words[0].rstrip(':') call(f'ip -{ipv} rule del priority {priority} ' + ' '.join(words[1:]))