shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-23 21:35:11 +03:00
Code

networkd-test: show service journal on startup failure

Browse Source 
This provides easier evaluation of failed tests.
This commit is contained in:
Martin Pitt 2019-02-26 23:03:35 +01:00
parent dc16327c48
commit 74c13b7659
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
test/networkd-test.py
View File

@ -335,13 +335,16 @@ class ClientTestBase(NetworkdTestingUtilities):
raise NotImplementedError('must be implemented by a subclass')
def start_unit(self, unit):
try:
subprocess.check_call(['systemctl', 'start', unit])
except subprocess.CalledProcessError:
self.show_journal(unit)
raise
def do_test(self, coldplug=True, ipv6=False, extra_opts='',
online_timeout=10, dhcp_mode='yes'):
try:
subprocess.check_call(['systemctl', 'start', 'systemd-resolved'])
except subprocess.CalledProcessError:
self.show_journal('systemd-resolved.service')
raise
self.start_unit('systemd-resolved')
self.write_network(self.config, '''\
[Match]
Name={}
@ -352,14 +355,14 @@ DHCP={}
if coldplug:
# create interface first, then start networkd
self.create_iface(ipv6=ipv6)
subprocess.check_call(['systemctl', 'start', 'systemd-networkd'])
self.start_unit('systemd-networkd')
elif coldplug is not None:
# start networkd first, then create interface
subprocess.check_call(['systemctl', 'start', 'systemd-networkd'])
self.start_unit('systemd-networkd')
self.create_iface(ipv6=ipv6)
else:
# "None" means test sets up interface by itself
subprocess.check_call(['systemctl', 'start', 'systemd-networkd'])
self.start_unit('systemd-networkd')
try:
subprocess.check_call([NETWORKD_WAIT_ONLINE, '--interface',
@ -618,7 +621,7 @@ Address=10.241.3.2/24
DNS=10.241.3.1
Domains= ~company ~lab''')
subprocess.check_call(['systemctl', 'start', 'systemd-networkd'])
self.start_unit('systemd-networkd')
subprocess.check_call([NETWORKD_WAIT_ONLINE, '--interface', self.iface,
'--interface=testvpnclient', '--timeout=20'])
@ -888,7 +891,7 @@ Address=192.168.42.100
DNS=192.168.42.1
Domains= one two three four five six seven eight nine ten''')
subprocess.check_call(['systemctl', 'start', 'systemd-networkd'])
self.start_unit('systemd-networkd')
for timeout in range(50):
with open(RESOLV_CONF) as f:
@ -920,7 +923,7 @@ Address=192.168.42.100
DNS=192.168.42.1
Domains={p}0 {p}1 {p}2 {p}3 {p}4'''.format(p=name_prefix))
subprocess.check_call(['systemctl', 'start', 'systemd-networkd'])
self.start_unit('systemd-networkd')
for timeout in range(50):
with open(RESOLV_CONF) as f:
@ -950,7 +953,8 @@ DNS=192.168.42.1''')
[Network]
DNS=127.0.0.1''')
subprocess.check_call(['systemctl', 'start', 'systemd-resolved', 'systemd-networkd'])
self.start_unit('systemd-resolved')
self.start_unit('systemd-networkd')
for timeout in range(50):
with open(RESOLV_CONF) as f: