Revert "tests: mark tests spawning a new port as flaky"

This reverts commit 0efde559064fc3b842d06b56bafa1c457b1a8fb4. This
isn't compatible with xdist...

diff --git a/tests/integration/requirements.txt b/tests/integration/requirements.txt
index 5d5086e073ca4bc17f9bf2ef15650ed2786fec4e..9528dae7cf3b6668fb1ea1e3873cff74699599cb 100644 (file)
--- a/tests/integration/requirements.txt
+++ b/tests/integration/requirements.txt
@@ -1,6 +1,5 @@
 apipkg==1.4
 execnet==1.4.1
-flaky==3.3.0
 py==1.4.31
 pyroute2==0.3.16
 pytest==2.9.0

diff --git a/tests/integration/test_interfaces.py b/tests/integration/test_interfaces.py
index e2766a785da739c6abbed797d68461968b07dfa7..571495e08ba5ac901b5eaa40d378a1753e847298 100644 (file)
--- a/tests/integration/test_interfaces.py
+++ b/tests/integration/test_interfaces.py
@@ -1,7 +1,6 @@
 import pytest
 import pyroute2
 import time
-from flaky import flaky
 
 
 def test_simple_bridge(lldpd1, lldpd, lldpcli, namespaces, links):
@@ -205,12 +204,11 @@ def test_down_then_up_with_vlan(lldpd1, lldpd, lldpcli, namespaces, links):
         assert out['lldp.eth0.vlan.vlan-id'] == ['300', '400']
 
 
-@flaky
 def test_new_interface(lldpd1, lldpd, lldpcli, namespaces, links):
     with namespaces(2):
         lldpd()
         links(namespaces(1), namespaces(2))
-        time.sleep(8)
+        time.sleep(10)
     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 39f289d5d1e84b4c7836c6238109602e30a91bb7..2c7fe1e6f80972c76fb20a8357445d59e74cd436 100644 (file)
--- a/tests/integration/test_lldpcli.py
+++ b/tests/integration/test_lldpcli.py
@@ -4,7 +4,6 @@ import re
 import platform
 import json
 import xml.etree.ElementTree as ET
-from flaky import flaky
 
 
 @pytest.fixture(scope='session')
@@ -190,7 +189,6 @@ def test_configure_one_port(lldpd1, lldpd, lldpcli, namespaces, links):
 
 @pytest.mark.skipif('Dot3' not in pytest.config.lldpd.features,
                     reason="Dot3 not supported")
-@flaky
 def test_new_port_take_default(lldpd1, lldpd, lldpcli, namespaces, links):
     with namespaces(2):
         lldpd()
@@ -205,7 +203,7 @@ def test_new_port_take_default(lldpd1, lldpd, lldpcli, namespaces, links):
         assert out['lldp.eth0.port.descr'] == 'eth1'
         assert out['lldp.eth0.port.power.device-type'] == 'PSE'
     links(namespaces(1), namespaces(2))
-    time.sleep(8)
+    time.sleep(10)
     with namespaces(1):
         out = lldpcli("-f", "keyvalue", "show", "neighbors", "details")
         assert out['lldp.eth2.port.descr'] == 'eth3'