shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-02-24 17:57:34 +03:00
Code

Merge pull request #23980 from yuwata/test-network

Browse Source 
test-network: tiny output improvements
This commit is contained in:
Yu Watanabe 2022-07-12 01:27:36 +02:00 committed by GitHub
commit 12a233265d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
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:])
@ -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:]))