summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2018-11-05 15:37:25 +0100
committerGitHub <noreply@github.com>2018-11-05 15:37:25 +0100
commita54e373163b79574a8799f6350cb3a4c318c57ee (patch)
tree4d80c9c337436ab16ae61ee3a08ef223d7e57c39 /test
parentMerge pull request #10641 from yuwata/fix-10639 (diff)
parentvlan-util: add assertions to parse_vlanid() (diff)
downloadsystemd-a54e373163b79574a8799f6350cb3a4c318c57ee.tar.xz
systemd-a54e373163b79574a8799f6350cb3a4c318c57ee.zip
Merge pull request #10618 from yuwata/fix-10615
network: fix several issues in config parser
Diffstat (limited to 'test')
-rw-r--r--test/test-network/conf/dhcp-client-timezone-router.network2
-rwxr-xr-xtest/test-network/systemd-networkd-tests.py1
2 files changed, 3 insertions, 0 deletions
diff --git a/test/test-network/conf/dhcp-client-timezone-router.network b/test/test-network/conf/dhcp-client-timezone-router.network
index 6316f9cf59..23e04649de 100644
--- a/test/test-network/conf/dhcp-client-timezone-router.network
+++ b/test/test-network/conf/dhcp-client-timezone-router.network
@@ -4,5 +4,7 @@ Name=veth99
[Network]
IPv6AcceptRA=false
DHCP=ipv4
+
+[DHCP]
UseRoutes=true
UseTimezone=true
diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py
index b418d15e8c..1a69af149c 100755
--- a/test/test-network/systemd-networkd-tests.py
+++ b/test/test-network/systemd-networkd-tests.py
@@ -61,6 +61,7 @@ class Utilities():
for link in links:
if os.path.exists(os.path.join('/sys/class/net', link)):
subprocess.call(['ip', 'link', 'del', 'dev', link])
+ time.sleep(1)
def read_ipv6_sysctl_attr(self, link, attribute):
with open(os.path.join(os.path.join(network_sysctl_ipv6_path, link), attribute)) as f: