From be0e1ef9b57741dbe408ff6934180000e09609b3 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 20 May 2019 22:40:54 +0900 Subject: [PATCH] test-network: wait for bridge slave to be enslaved in test_bridge_ignore_carrier_loss_frequent_loss_and_gain() --- test/test-network/systemd-networkd-tests.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index 63d5cfd..6787fdc 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -1777,15 +1777,18 @@ class NetworkdNetWorkBridgeTests(unittest.TestCase, Utilities): self.assertEqual(subprocess.call(['ip', 'link', 'add', 'dummy98', 'type', 'dummy']), 0) self.assertEqual(subprocess.call(['ip', 'link', 'set', 'dummy98', 'up']), 0) - time.sleep(3) + for trial in range(30): + if trial > 0: + time.sleep(1) + if self.get_operstate('bridge99') == 'routable' and self.get_operstate('dummy98') == 'enslaved': + break + else: + self.assertTrue(False) output = subprocess.check_output(['ip', 'address', 'show', 'bridge99'], universal_newlines=True).rstrip() print(output) self.assertRegex(output, 'inet 192.168.0.15/24 brd 192.168.0.255 scope global bridge99') - self.check_operstate('bridge99', 'routable') - self.check_operstate('dummy98', 'enslaved') - output = subprocess.check_output(['ip', 'rule', 'list', 'table', '100'], universal_newlines=True).rstrip() print(output) self.assertEqual(output, '0: from all to 8.8.8.8 lookup 100') -- 2.7.4