From: Yu Watanabe Date: Fri, 31 May 2019 04:54:08 +0000 (+0900) Subject: test-network: show systemd-networkd.service X-Git-Tag: v243-rc1~333^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=72917fcc65dfad7081cb34d09df75a1b5ffa00c3;p=thirdparty%2Fsystemd.git test-network: show systemd-networkd.service As there may exist some other drop-in configs. --- diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index 692bd19159f..335e3215f29 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -112,14 +112,13 @@ def setUpModule(): if use_valgrind or asan_options or lsan_options or ubsan_options: drop_in += ['MemoryDenyWriteExecute=no'] - drop_in_str = '\n'.join(drop_in) - print(drop_in_str) - os.makedirs('/run/systemd/system/systemd-networkd.service.d', exist_ok=True) with open('/run/systemd/system/systemd-networkd.service.d/00-override.conf', mode='w') as f: - f.write(drop_in_str) + f.write('\n'.join(drop_in)) subprocess.check_call('systemctl daemon-reload', shell=True) + output = subprocess.check_output(['systemctl', 'cat', 'systemd-networkd.service'], universal_newlines=True).rstrip() + print(output) def tearDownModule(): shutil.rmtree(networkd_ci_path)