From 2bfa2091e28cdcd53834ae3fcb44a93bd84631c7 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Fri, 27 Nov 2015 11:12:40 +0100 Subject: [PATCH] debian/tests/networkd: For IPv6 tests, also wait for IPv4 address to arrive s-n-wait-online already exits after getting an IPv6 address, but we verify both. --- debian/changelog | 3 +++ debian/tests/networkd | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index acd91db26..74cbc834f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,9 @@ systemd (228-3) UNRELEASED; urgency=medium * debian/tests/networkd: If /etc/resolv.conf already has three nameservers, accept that too (as then the additional test one can't be added any more). * Fix FTBFS on x32. Thanks Helmut Grohne! (Closes: #805910) + * debian/tests/networkd: For IPv6 tests, also wait for IPv4 address to + arrive; s-n-wait-online already exits after getting an IPv6 address, but + we verify both. [ Michael Biebl ] * Bump Build-Depends on libdw-dev to (>= 0.158) as per configure.ac. diff --git a/debian/tests/networkd b/debian/tests/networkd index 274aea65a..788623be5 100755 --- a/debian/tests/networkd +++ b/debian/tests/networkd @@ -121,11 +121,12 @@ DHCP=%s if ipv6: # check iface state and IP 6 address; FIXME: we need to wait a bit - # longer, as the iface is "configured" already with IPv4 + # longer, as the iface is "configured" already with IPv4 *or* + # IPv6, but we want to wait for both timeout = 10 while timeout > 0: out = subprocess.check_output(['ip', 'a', 'show', 'dev', self.iface]) - if b'state UP' in out and b'inet6 2600' in out: + if b'state UP' in out and b'inet6 2600' in out and b'inet 192.168' in out: break time.sleep(1) timeout -= 1