]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
test-network: increase wait_online timeout to handle longer dhcpv4 transient timeout 17908/head
authorDan Streetman <ddstreet@canonical.com>
Wed, 9 Dec 2020 20:24:09 +0000 (15:24 -0500)
committerDan Streetman <ddstreet@canonical.com>
Mon, 14 Dec 2020 23:19:32 +0000 (18:19 -0500)
Previous commits changed the dhcpv4 retransmission algorithm to be
slightly slower, changing the amount of time it takes to notify
systemd-networkd that the dhcpv4 configuration has (transiently)
failed from around 14 second up to 28 seconds.

Since the test_dhcp_client_with_ipv4ll_without_dhcp_server test
configures an interface to use dhcpv4 without any operating dhcpv4
server running, it must increase the amount of time it waits for
the test interface to reach degraded state.

test/test-network/systemd-networkd-tests.py

index 0a33ce777995bb84a2dd1bead798a44ab06ed4a8..454e6ce66b4bde0f6b4de7d9594c07fe6edeccf0 100755 (executable)
@@ -4104,7 +4104,9 @@ class NetworkdDHCPClientTests(unittest.TestCase, Utilities):
         copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp-server-veth-peer.network',
                                         'dhcp-client-with-ipv4ll.network')
         start_networkd()
-        self.wait_online(['veth99:degraded', 'veth-peer:routable'])
+        # we need to increase timeout above default, as this will need to wait for
+        # systemd-networkd to get the dhcpv4 transient failure event
+        self.wait_online(['veth99:degraded', 'veth-peer:routable'], timeout='60s')
 
         output = check_output('ip address show dev veth99')
         print(output)