From b226c15cfb993dc6e00ae6180bb287fc4dd93acd Mon Sep 17 00:00:00 2001 From: Dan Streetman Date: Wed, 9 Dec 2020 15:24:09 -0500 Subject: [PATCH] test-network: increase wait_online timeout to handle longer dhcpv4 transient timeout 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 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index 0a33ce7779..454e6ce66b 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -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)