]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
test-network: add test for ConfigureWithoutCarrier= 12794/head
authorYu Watanabe <watanabe.yu+github@gmail.com>
Thu, 13 Jun 2019 20:25:00 +0000 (05:25 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Thu, 13 Jun 2019 20:25:35 +0000 (05:25 +0900)
test/test-network/conf/25-bridge-configure-without-carrier.network [new file with mode: 0644]
test/test-network/systemd-networkd-tests.py

diff --git a/test/test-network/conf/25-bridge-configure-without-carrier.network b/test/test-network/conf/25-bridge-configure-without-carrier.network
new file mode 100644 (file)
index 0000000..c7d2583
--- /dev/null
@@ -0,0 +1,7 @@
+[Match]
+Name=bridge99
+
+[Network]
+LinkLocalAddressing=yes
+IPv6AcceptRA=no
+ConfigureWithoutCarrier=yes
index f22fdbe5af754921764db1c1fd560506ad6b386d..eb9cf8375dca8658af6539be085dbf60e79ed145 100755 (executable)
@@ -471,6 +471,7 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities):
         '25-bond.netdev',
         '25-bond-balanced-tlb.netdev',
         '25-bridge.netdev',
+        '25-bridge-configure-without-carrier.network',
         '25-bridge.network',
         '25-erspan-tunnel-local-any.netdev',
         '25-erspan-tunnel.netdev',
@@ -585,10 +586,10 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities):
         self.check_operstate('test1', 'degraded')
 
     def test_bridge(self):
-        copy_unit_to_networkd_unit_path('25-bridge.netdev')
+        copy_unit_to_networkd_unit_path('25-bridge.netdev', '25-bridge-configure-without-carrier.network')
         start_networkd(0)
 
-        wait_online(['bridge99:off'])
+        wait_online(['bridge99:no-carrier'])
 
         tick = os.sysconf('SC_CLK_TCK')
         self.assertEqual(9, round(float(read_link_attr('bridge99', 'bridge', 'hello_time')) / tick))