mirror of
https://github.com/systemd/systemd-stable.git
synced 2025-01-11 05:17:44 +03:00
test-network: disable debugging logs from networkctl, resolvectl, and so on
This commit is contained in:
parent
589af70b87
commit
163d095fc3
@ -52,6 +52,7 @@ timedatectl_bin=shutil.which('timedatectl', path=which_paths)
|
|||||||
use_valgrind=False
|
use_valgrind=False
|
||||||
enable_debug=True
|
enable_debug=True
|
||||||
env = {}
|
env = {}
|
||||||
|
wait_online_env = {}
|
||||||
asan_options=None
|
asan_options=None
|
||||||
lsan_options=None
|
lsan_options=None
|
||||||
ubsan_options=None
|
ubsan_options=None
|
||||||
@ -691,7 +692,7 @@ class Utilities():
|
|||||||
if ipv6:
|
if ipv6:
|
||||||
args += ['--ipv6']
|
args += ['--ipv6']
|
||||||
try:
|
try:
|
||||||
check_output(*args, env=env)
|
check_output(*args, env=wait_online_env)
|
||||||
except subprocess.CalledProcessError:
|
except subprocess.CalledProcessError:
|
||||||
for link in links_with_operstate:
|
for link in links_with_operstate:
|
||||||
name = link.split(':')[0]
|
name = link.split(':')[0]
|
||||||
@ -5712,8 +5713,6 @@ if __name__ == '__main__':
|
|||||||
timedatectl_cmd = [timedatectl_bin]
|
timedatectl_cmd = [timedatectl_bin]
|
||||||
wait_online_cmd = [wait_online_bin]
|
wait_online_cmd = [wait_online_bin]
|
||||||
|
|
||||||
if enable_debug:
|
|
||||||
env.update({ 'SYSTEMD_LOG_LEVEL' : 'debug' })
|
|
||||||
if asan_options:
|
if asan_options:
|
||||||
env.update({ 'ASAN_OPTIONS' : asan_options })
|
env.update({ 'ASAN_OPTIONS' : asan_options })
|
||||||
if lsan_options:
|
if lsan_options:
|
||||||
@ -5721,5 +5720,9 @@ if __name__ == '__main__':
|
|||||||
if ubsan_options:
|
if ubsan_options:
|
||||||
env.update({ 'UBSAN_OPTIONS' : ubsan_options })
|
env.update({ 'UBSAN_OPTIONS' : ubsan_options })
|
||||||
|
|
||||||
|
wait_online_env = env.copy()
|
||||||
|
if enable_debug:
|
||||||
|
wait_online_env.update({ 'SYSTEMD_LOG_LEVEL' : 'debug' })
|
||||||
|
|
||||||
sys.argv[1:] = unknown_args
|
sys.argv[1:] = unknown_args
|
||||||
unittest.main(verbosity=3)
|
unittest.main(verbosity=3)
|
||||||
|
Loading…
Reference in New Issue
Block a user