From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 26 Jan 2021 12:06:36 +0000 (+0900)
Subject: test-network: retry several times if expected LLDP info is not obtained
X-Git-Tag: v248-rc1~250
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f0d87798eaed167daf5a21e07ec8dc821f07ec19;p=thirdparty%2Fsystemd.git

test-network: retry several times if expected LLDP info is not obtained

As LLDP thing does not get involved in the link status, `networkctl lldp`
may not provide an expected information even if the link is in
'configured' state.

Fixes #17360.
---

diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py
index ecd3eaf8f9b..ab43bf30d6e 100755
--- a/test/test-network/systemd-networkd-tests.py
+++ b/test/test-network/systemd-networkd-tests.py
@@ -3429,10 +3429,16 @@ class NetworkdLLDPTests(unittest.TestCase, Utilities):
         start_networkd()
         self.wait_online(['veth99:degraded', 'veth-peer:degraded'])
 
-        output = check_output(*networkctl_cmd, 'lldp', env=env)
-        print(output)
-        self.assertRegex(output, 'veth-peer')
-        self.assertRegex(output, 'veth99')
+        for trial in range(10):
+            if trial > 0:
+                time.sleep(1)
+
+            output = check_output(*networkctl_cmd, 'lldp', env=env)
+            print(output)
+            if re.search(r'veth99 .* veth-peer', output):
+                break
+        else:
+            self.fail()
 
 class NetworkdRATests(unittest.TestCase, Utilities):
     links = ['veth99']