From: Vincent Bernat <vincent@bernat.im>
Date: Fri, 18 Mar 2016 19:21:02 +0000 (+0100)
Subject: tests/integration: sleep a bit more
X-Git-Tag: 0.9.2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4af75e556bacf40d271dc5e2f58d8150923fefc4;p=thirdparty%2Flldpd.git

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 feeb7e7f..8d324263 100644
--- 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 8b2d5d5f..54a05ae3 100644
--- 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 5f266da8..f24e0372 100644
--- 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 69438d45..8961c110 100644
--- 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 efd80005..32aa6230 100644
--- 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 de402386..4a7285ac 100644
--- 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")