summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2019-03-22 05:53:15 +0900
committerYu Watanabe <watanabe.yu+github@gmail.com>2019-03-30 02:27:22 +0900
commitba1e0d0612e5c6adc7d199eefdd266fbb65a0ee9 (patch)
tree3b74a54b363979dc5bc584053372107be15e2887 /test
parent2dcfcc08d93f8b41ffa2226ddad2f5ae0c6261bc (diff)
downloadsystemd-ba1e0d0612e5c6adc7d199eefdd266fbb65a0ee9.tar.gz
test-network: use wait_online() in test_sysctl()
This also disables IPv6AcceptRA= to speed up the test.
Diffstat (limited to 'test')
-rw-r--r--test/test-network/conf/25-sysctl.network1
-rwxr-xr-xtest/test-network/systemd-networkd-tests.py3
2 files changed, 3 insertions, 1 deletions
diff --git a/test/test-network/conf/25-sysctl.network b/test/test-network/conf/25-sysctl.network
index 2452fb7e85..68be305477 100644
--- a/test/test-network/conf/25-sysctl.network
+++ b/test/test-network/conf/25-sysctl.network
@@ -8,3 +8,4 @@ IPv6DuplicateAddressDetection=3
IPv6HopLimit=5
IPv4ProxyARP=true
IPv6ProxyNDP=true
+IPv6AcceptRA=no
diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py
index c39250caf2..d0b348691f 100755
--- a/test/test-network/systemd-networkd-tests.py
+++ b/test/test-network/systemd-networkd-tests.py
@@ -1262,7 +1262,8 @@ class NetworkdNetWorkTests(unittest.TestCase, Utilities):
def test_sysctl(self):
self.copy_unit_to_networkd_unit_path('25-sysctl.network', '12-dummy.netdev')
- self.start_networkd()
+ self.start_networkd(0)
+ self.wait_online(['dummy98:degraded'])
self.assertTrue(self.link_exits('dummy98'))