From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sun, 12 Jul 2020 00:28:53 +0000 (+0900)
Subject: test-network: wait for addresses are not in tentative state
X-Git-Tag: v246-rc2~67^2~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=571f953934ad8369a1ef2761d6da1e03d3bbd48a;p=thirdparty%2Fsystemd.git

test-network: wait for addresses are not in tentative state
---

diff --git a/test/networkd-test.py b/test/networkd-test.py
index 618237161a3..b2256948194 100755
--- a/test/networkd-test.py
+++ b/test/networkd-test.py
@@ -376,7 +376,7 @@ DHCP={}
                 # IPv6, but we want to wait for both
                 for _ in range(10):
                     out = subprocess.check_output(['ip', 'a', 'show', 'dev', self.iface])
-                    if b'state UP' in out and b'inet6 2600' in out and b'inet 192.168' in out:
+                    if b'state UP' in out and b'inet6 2600' in out and b'inet 192.168' in out and b'tentative' not in out:
                         break
                     time.sleep(1)
                 else:
diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py
index 31ef04af8a4..2d7f915850e 100755
--- a/test/test-network/systemd-networkd-tests.py
+++ b/test/test-network/systemd-networkd-tests.py
@@ -557,7 +557,7 @@ class Utilities():
             if i > 0:
                 time.sleep(1)
             output = check_output(f'ip {ipv} address show dev {link} scope {scope}')
-            if re.search(address_regex, output):
+            if re.search(address_regex, output) and 'tentative' not in output:
                 break
         else:
             self.assertRegex(output, address_regex)