picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #9534 from martinpitt/nm-test

Browse source 
Fix networkd test
This commit is contained in:
Lennart Poettering 2018-07-13 19:50:14 +02:00 committed by GitHub
parent bd7d173274 c4a0a2d5f8
commit 8840c47c0d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 36 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
test/networkd-test.py
View file

@ -37,16 +37,36 @@ NETWORKD_WAIT_ONLINE = shutil.which('systemd-networkd-wait-online',
RESOLV_CONF = '/run/systemd/resolve/resolv.conf'
tmpmounts = []
running_units = []
stopped_units = []
def setUpModule():
global tmpmounts
"""Initialize the environment, and perform sanity checks on it."""
if NETWORKD_WAIT_ONLINE is None:
raise OSError(errno.ENOENT, 'systemd-networkd-wait-online not found')
# Do not run any tests if the system is using networkd already.
if subprocess.call(['systemctl', 'is-active', '--quiet',
'systemd-networkd.service']) == 0:
raise unittest.SkipTest('networkd is already active')
# Do not run any tests if the system is using networkd already and it's not virtualized
if (subprocess.call(['systemctl', 'is-active', '--quiet', 'systemd-networkd.service']) == 0 and
subprocess.call(['systemd-detect-virt', '--quiet']) != 0):
raise unittest.SkipTest('not virtualized and networkd is already active')
# Ensure we don't mess with an existing networkd config
for u in ['systemd-networkd.socket', 'systemd-networkd', 'systemd-resolved']:
if subprocess.call(['systemctl', 'is-active', '--quiet', u]) == 0:
subprocess.call(['systemctl', 'stop', u])
running_units.append(u)
else:
stopped_units.append(u)
for d in ['/etc/systemd/network', '/run/systemd/network',
'/run/systemd/netif', '/run/systemd/resolve']:
if os.path.isdir(d):
subprocess.check_call(["mount", "-t", "tmpfs", "none", d])
tmpmounts.append(d)
if os.path.isdir('/run/systemd/resolve'):
os.chmod('/run/systemd/resolve', 0o755)
# Avoid "Failed to open /dev/tty" errors in containers.
os.environ['SYSTEMD_LOG_TARGET'] = 'journal'
@ -60,6 +80,16 @@ def setUpModule():
subprocess.check_call(['adduser', '--system', '--no-create-home', 'systemd-network'])
def tearDownModule():
global tmpmounts
for d in tmpmounts:
subprocess.check_call(["umount", d])
for u in stopped_units:
subprocess.call(["systemctl", "stop", u])
for u in running_units:
subprocess.call(["systemctl", "restart", u])
class NetworkdTestingUtilities:
"""Provide a set of utility functions to facilitate networkd tests.
@ -177,7 +207,7 @@ Name=mybridge
DNS=192.168.250.1
Address=192.168.250.33/24
Gateway=192.168.250.1''')
subprocess.check_call(['systemctl', 'reset-failed', 'systemd-networkd'])
subprocess.call(['systemctl', 'reset-failed', 'systemd-networkd', 'systemd-resolved'])
subprocess.check_call(['systemctl', 'start', 'systemd-networkd'])
def tearDown(self):
@ -263,7 +293,7 @@ class ClientTestBase(NetworkdTestingUtilities):
self.assertTrue(out.startswith('-- cursor:'))
self.journal_cursor = out.split()[-1]
subprocess.check_call(['systemctl', 'reset-failed', 'systemd-networkd'])
subprocess.call(['systemctl', 'reset-failed', 'systemd-networkd', 'systemd-resolved'])
def tearDown(self):
self.shutdown_iface()