diff options
| author | Martin Pitt <martin@piware.de> | 2019-02-21 12:34:23 +0100 |
|---|---|---|
| committer | Martin Pitt <martin@piware.de> | 2019-02-21 12:37:08 +0100 |
| commit | f5cf985e9cc6fff747ca17acadb1b4751076103b (patch) | |
| tree | 94492b141f7a250429501f85ce2c9e892a9f8b3e | |
| parent | ca56805c8de43fc21ab4657cf5ebd1e0248527ac (diff) | |
| download | systemd-f5cf985e9cc6fff747ca17acadb1b4751076103b.tar.gz | |
networkd-test: fix test_dropin()
- This test needs resolved, so make sure it is started. In some Debian
environments it is not.
- It was an unnecessary, and now failing assumption that name servers
get atomically written to the resolved's resolv.conf. Wait until both
expected name servers are in the file.
| -rwxr-xr-x | test/networkd-test.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/networkd-test.py b/test/networkd-test.py index c03e76052f..9487910b71 100755 --- a/test/networkd-test.py +++ b/test/networkd-test.py @@ -950,12 +950,12 @@ DNS=192.168.42.1''') [Network] DNS=127.0.0.1''') - subprocess.check_call(['systemctl', 'start', 'systemd-networkd']) + subprocess.check_call(['systemctl', 'start', 'systemd-resolved', 'systemd-networkd']) for timeout in range(50): with open(RESOLV_CONF) as f: contents = f.read() - if ' 127.0.0.1' in contents: + if ' 127.0.0.1' in contents and '192.168.42.1' in contents: break time.sleep(0.1) self.assertIn('nameserver 192.168.42.1\n', contents) |