diff options
author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2022-08-05 23:20:28 +0200 |
---|---|---|
committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2022-08-09 12:37:49 +0200 |
commit | 66504b22e25c7e879b95431ecfc94dc238cc98c9 (patch) | |
tree | 9fa34e55233f83e6f05179adf4827aa488d8b95c /test | |
parent | test-network: also run timesyncd under sanitizer or valgrind (diff) | |
download | systemd-66504b22e25c7e879b95431ecfc94dc238cc98c9.tar.xz systemd-66504b22e25c7e879b95431ecfc94dc238cc98c9.zip |
test-network: drop unused text= arguments
Diffstat (limited to 'test')
-rwxr-xr-x | test/test-network/systemd-networkd-tests.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index e0587bc89d..cb014d67f3 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -95,24 +95,24 @@ def mkdir_p(path): def touch(path): pathlib.Path(path).touch() -def check_output(*command, text=True, **kwargs): +def check_output(*command, **kwargs): # This checks the result and returns stdout (and stderr) on success. command = command[0].split() + list(command[1:]) - return subprocess.run(command, check=True, universal_newlines=text, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, **kwargs).stdout.rstrip() + return subprocess.run(command, check=True, universal_newlines=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, **kwargs).stdout.rstrip() -def call(*command, text=True, **kwargs): +def call(*command, **kwargs): # 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, stderr=subprocess.STDOUT, **kwargs).returncode + return subprocess.run(command, check=False, universal_newlines=True, stderr=subprocess.STDOUT, **kwargs).returncode -def call_quiet(*command, text=True, **kwargs): +def call_quiet(*command, **kwargs): command = command[0].split() + list(command[1:]) - return subprocess.run(command, check=False, universal_newlines=text, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, **kwargs).returncode + return subprocess.run(command, check=False, universal_newlines=True, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, **kwargs).returncode -def run(*command, text=True, **kwargs): +def run(*command, **kwargs): # This returns CompletedProcess instance. command = command[0].split() + list(command[1:]) - return subprocess.run(command, check=False, universal_newlines=text, stdout=subprocess.PIPE, stderr=subprocess.PIPE, **kwargs) + return subprocess.run(command, check=False, universal_newlines=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE, **kwargs) def is_module_available(module_name): lsmod_output = check_output('lsmod') |