From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Thu, 21 Mar 2019 20:53:15 +0000 (+0900)
Subject: test-network: use wait_online() in test_sysctl()
X-Git-Tag: v242-rc1~39^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ba1e0d0612e5c6adc7d199eefdd266fbb65a0ee9;p=thirdparty%2Fsystemd.git

test-network: use wait_online() in test_sysctl()

This also disables IPv6AcceptRA= to speed up the test.
---

diff --git a/test/test-network/conf/25-sysctl.network b/test/test-network/conf/25-sysctl.network
index 2452fb7e856..68be3054770 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 c39250caf23..d0b348691fc 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'))