shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-06 13:17:44 +03:00
Code

Merge pull request #11834 from martinpitt/network-test-fixes

Browse Source 
networkd-test fix/improvement
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2019-02-28 17:48:41 +01:00 committed by GitHub
commit 2fe4c28d30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 40 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
test/networkd-test.py
View File

@ -29,6 +29,7 @@ import time
import unittest import unittest
HAVE_DNSMASQ = shutil.which('dnsmasq') is not None HAVE_DNSMASQ = shutil.which('dnsmasq') is not None
IS_CONTAINER = subprocess.call(['systemd-detect-virt', '--quiet', '--container']) == 0
NETWORK_UNITDIR = '/run/systemd/network' NETWORK_UNITDIR = '/run/systemd/network'
@ -335,13 +336,16 @@ class ClientTestBase(NetworkdTestingUtilities):
raise NotImplementedError('must be implemented by a subclass') 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='', def do_test(self, coldplug=True, ipv6=False, extra_opts='',
online_timeout=10, dhcp_mode='yes'): online_timeout=10, dhcp_mode='yes'):
try: self.start_unit('systemd-resolved')
subprocess.check_call(['systemctl', 'start', 'systemd-resolved'])
except subprocess.CalledProcessError:
self.show_journal('systemd-resolved.service')
raise
self.write_network(self.config, '''\ self.write_network(self.config, '''\
[Match] [Match]
Name={} Name={}
@ -352,14 +356,14 @@ DHCP={}
if coldplug: if coldplug:
# create interface first, then start networkd # create interface first, then start networkd
self.create_iface(ipv6=ipv6) self.create_iface(ipv6=ipv6)
subprocess.check_call(['systemctl', 'start', 'systemd-networkd']) self.start_unit('systemd-networkd')
elif coldplug is not None: elif coldplug is not None:
# start networkd first, then create interface # start networkd first, then create interface
subprocess.check_call(['systemctl', 'start', 'systemd-networkd']) self.start_unit('systemd-networkd')
self.create_iface(ipv6=ipv6) self.create_iface(ipv6=ipv6)
else: else:
# "None" means test sets up interface by itself # "None" means test sets up interface by itself
subprocess.check_call(['systemctl', 'start', 'systemd-networkd']) self.start_unit('systemd-networkd')
try: try:
subprocess.check_call([NETWORKD_WAIT_ONLINE, '--interface', subprocess.check_call([NETWORKD_WAIT_ONLINE, '--interface',
@ -472,12 +476,19 @@ MACAddress=12:34:56:78:9a:bc''')
[Match] [Match]
Name=dummy0 Name=dummy0
[Network] [Network]
Address=192.168.42.100 Address=192.168.42.100/24
DNS=192.168.42.1 DNS=192.168.42.1
Domains= ~company''') Domains= ~company''')
self.do_test(coldplug=True, ipv6=False, try:
extra_opts='IPv6AcceptRouterAdvertisements=False') self.do_test(coldplug=True, ipv6=False,
extra_opts='IPv6AcceptRouterAdvertisements=False')
except subprocess.CalledProcessError as e:
# networkd often fails to start in LXC: https://github.com/systemd/systemd/issues/11848
if IS_CONTAINER and e.cmd == ['systemctl', 'start', 'systemd-networkd']:
raise unittest.SkipTest('https://github.com/systemd/systemd/issues/11848')
else:
raise
with open(RESOLV_CONF) as f: with open(RESOLV_CONF) as f:
contents = f.read() contents = f.read()
@ -496,12 +507,19 @@ MACAddress=12:34:56:78:9a:bc''')
self.write_network('myvpn.network', '''[Match] self.write_network('myvpn.network', '''[Match]
Name=dummy0 Name=dummy0
[Network] [Network]
Address=192.168.42.100 Address=192.168.42.100/24
DNS=192.168.42.1 DNS=192.168.42.1
Domains= ~company ~.''') Domains= ~company ~.''')
self.do_test(coldplug=True, ipv6=False, try:
extra_opts='IPv6AcceptRouterAdvertisements=False') self.do_test(coldplug=True, ipv6=False,
extra_opts='IPv6AcceptRouterAdvertisements=False')
except subprocess.CalledProcessError as e:
# networkd often fails to start in LXC: https://github.com/systemd/systemd/issues/11848
if IS_CONTAINER and e.cmd == ['systemctl', 'start', 'systemd-networkd']:
raise unittest.SkipTest('https://github.com/systemd/systemd/issues/11848')
else:
raise
with open(RESOLV_CONF) as f: with open(RESOLV_CONF) as f:
contents = f.read() contents = f.read()
@ -618,7 +636,7 @@ Address=10.241.3.2/24
DNS=10.241.3.1 DNS=10.241.3.1
Domains= ~company ~lab''') Domains= ~company ~lab''')
subprocess.check_call(['systemctl', 'start', 'systemd-networkd']) self.start_unit('systemd-networkd')
subprocess.check_call([NETWORKD_WAIT_ONLINE, '--interface', self.iface, subprocess.check_call([NETWORKD_WAIT_ONLINE, '--interface', self.iface,
'--interface=testvpnclient', '--timeout=20']) '--interface=testvpnclient', '--timeout=20'])
@ -884,11 +902,11 @@ MACAddress=12:34:56:78:9a:bc''')
[Match] [Match]
Name=dummy0 Name=dummy0
[Network] [Network]
Address=192.168.42.100 Address=192.168.42.100/24
DNS=192.168.42.1 DNS=192.168.42.1
Domains= one two three four five six seven eight nine ten''') 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): for timeout in range(50):
with open(RESOLV_CONF) as f: with open(RESOLV_CONF) as f:
@ -916,11 +934,11 @@ MACAddress=12:34:56:78:9a:bc''')
[Match] [Match]
Name=dummy0 Name=dummy0
[Network] [Network]
Address=192.168.42.100 Address=192.168.42.100/24
DNS=192.168.42.1 DNS=192.168.42.1
Domains={p}0 {p}1 {p}2 {p}3 {p}4'''.format(p=name_prefix)) 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): for timeout in range(50):
with open(RESOLV_CONF) as f: with open(RESOLV_CONF) as f:
@ -944,13 +962,14 @@ MACAddress=12:34:56:78:9a:bc''')
[Match] [Match]
Name=dummy0 Name=dummy0
[Network] [Network]
Address=192.168.42.100 Address=192.168.42.100/24
DNS=192.168.42.1''') DNS=192.168.42.1''')
self.write_network_dropin('test.network', 'dns', '''\ self.write_network_dropin('test.network', 'dns', '''\
[Network] [Network]
DNS=127.0.0.1''') 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): for timeout in range(50):
with open(RESOLV_CONF) as f: with open(RESOLV_CONF) as f: