tests/integration: sleep a bit more

With address sanitizer, things are now slower.

diff --git a/tests/integration/fixtures/programs.py b/tests/integration/fixtures/programs.py
index feeb7e7f8fb6c496cd35e51105ab7536e526d378..8d3242635f2e41941311f2de47689e912f19a2b2 100644 (file)
--- a/tests/integration/fixtures/programs.py
+++ b/tests/integration/fixtures/programs.py
@@ -130,7 +130,7 @@ class LldpdFactory(object):
         self.threads = []
         self.counter = 0
 
-    def __call__(self, *args, sleep=2, silent=False):
+    def __call__(self, *args, sleep=3, silent=False):
         self.counter += 1
         self.setup_namespace("ns-{}".format(self.counter))
         args = (self.config.option.verbose > 2 and "-dddd" or "-dd",

diff --git a/tests/integration/test_custom.py b/tests/integration/test_custom.py
index 8b2d5d5f4cd129af45fcac721eafde51215d7cb6..54a05ae3b6949d18ffd19e85eb4d23e88ef8843a 100644 (file)
--- a/tests/integration/test_custom.py
+++ b/tests/integration/test_custom.py
@@ -60,7 +60,7 @@ def test_custom_tlv(lldpd1, lldpd, lldpcli, namespaces,
                     command.startswith("-") and "un" or "",
                     command.lstrip("-"))))
             assert result.returncode == 0
-        time.sleep(2)
+        time.sleep(3)
     with namespaces(1):
         pfx = "lldp.eth0.unknown-tlvs."
         out = lldpcli("-f", "keyvalue", "show", "neighbors", "details")

diff --git a/tests/integration/test_dot3.py b/tests/integration/test_dot3.py
index 5f266da80cf17495abd313b1460ec4d8e828a907..f24e0372f8a3c5f53ef663392f296d4dfc466ca0 100644 (file)
--- a/tests/integration/test_dot3.py
+++ b/tests/integration/test_dot3.py
@@ -49,7 +49,7 @@ class TestLldpDot3(object):
             result = lldpcli(
                 *shlex.split("configure dot3 power {}".format(command)))
             assert result.returncode == 0
-            time.sleep(2)
+            time.sleep(3)
         with namespaces(1):
             pfx = "lldp.eth0.port.power."
             out = lldpcli("-f", "keyvalue", "show", "neighbors", "details")

diff --git a/tests/integration/test_interfaces.py b/tests/integration/test_interfaces.py
index 69438d4572e1b18adb4d060476a0e62f012655a3..8961c1100d58f49fda7fff65825d32f71fcebe5d 100644 (file)
--- a/tests/integration/test_interfaces.py
+++ b/tests/integration/test_interfaces.py
@@ -131,7 +131,7 @@ def test_remove_vlan(lldpd1, lldpd, lldpcli, namespaces, links, kind):
         links.vlan('vlan500', 500, iface)
         lldpd()
         links.remove('vlan300')
-        time.sleep(4)
+        time.sleep(6)
     with namespaces(1):
         out = lldpcli("-f", "keyvalue", "show", "neighbors", "details")
         assert out['lldp.eth0.port.descr'] == 'eth1'

diff --git a/tests/integration/test_lldpcli.py b/tests/integration/test_lldpcli.py
index efd800051ca8f37e7970b5f07e655502d88d4bb3..32aa62309a8e1e059f96d35925220592b7b3ebe4 100644 (file)
--- a/tests/integration/test_lldpcli.py
+++ b/tests/integration/test_lldpcli.py
@@ -154,7 +154,7 @@ def test_configure_one_port(lldpd1, lldpd, lldpcli, namespaces, links):
                            "pse supported enabled paircontrol powerpairs "
                            "spare class class-3").split())
         assert result.returncode == 0
-        time.sleep(2)
+        time.sleep(3)
     with namespaces(1):
         out = lldpcli("-f", "keyvalue", "show", "neighbors", "details")
         assert out['lldp.eth0.port.descr'] == 'eth1'
@@ -172,7 +172,7 @@ def test_new_port_take_default(lldpd1, lldpd, lldpcli, namespaces, links):
                            "pse supported enabled paircontrol powerpairs "
                            "spare class class-3").split())
         assert result.returncode == 0
-        time.sleep(2)
+        time.sleep(3)
     with namespaces(1):
         # Check this worked
         out = lldpcli("-f", "keyvalue", "show", "neighbors", "details")
@@ -196,11 +196,11 @@ def test_port_keep_configuration(lldpd1, lldpd, lldpcli, namespaces, links):
                            "pse supported enabled paircontrol powerpairs "
                            "spare class class-3").split())
         assert result.returncode == 0
-        time.sleep(2)
-        links.down('eth3')
         time.sleep(3)
+        links.down('eth3')
+        time.sleep(4)
         links.up('eth3')
-        time.sleep(3)
+        time.sleep(4)
     with namespaces(1):
         out = lldpcli("-f", "keyvalue", "show", "neighbors", "details")
         assert out['lldp.eth2.port.descr'] == 'eth3'

diff --git a/tests/integration/test_med.py b/tests/integration/test_med.py
index de402386b5a6eb79fa0363ca7e1774279d7925c0..4a7285ac9d396b0a48df6aceb6dcc204003596f7 100644 (file)
--- a/tests/integration/test_med.py
+++ b/tests/integration/test_med.py
@@ -118,7 +118,7 @@ class TestLldpMed(object):
             result = lldpcli(
                 *shlex.split("configure med {}".format(command)))
             assert result.returncode == 0
-            time.sleep(2)
+            time.sleep(3)
         with namespaces(1):
             pfx = "lldp.eth0.lldp-med.{}.".format(pfx)
             out = lldpcli("-f", "keyvalue", "show", "neighbors", "details")