From: Vincent Bernat <vincent@bernat.im>
Date: Mon, 26 Dec 2016 09:52:57 +0000 (+0100)
Subject: tests: mark tests spawning a new port as flaky
X-Git-Tag: 0.9.6~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0efde559064fc3b842d06b56bafa1c457b1a8fb4;p=thirdparty%2Flldpd.git

tests: mark tests spawning a new port as flaky

They will be retried once.
---

diff --git a/tests/integration/requirements.txt b/tests/integration/requirements.txt
index 9528dae7..5d5086e0 100644
--- a/tests/integration/requirements.txt
+++ b/tests/integration/requirements.txt
@@ -1,5 +1,6 @@
 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 b840019e..e2766a78 100644
--- a/tests/integration/test_interfaces.py
+++ b/tests/integration/test_interfaces.py
@@ -1,6 +1,7 @@
 import pytest
 import pyroute2
 import time
+from flaky import flaky
 
 
 def test_simple_bridge(lldpd1, lldpd, lldpcli, namespaces, links):
@@ -204,6 +205,7 @@ 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()
diff --git a/tests/integration/test_lldpcli.py b/tests/integration/test_lldpcli.py
index 79f56aa0..39f289d5 100644
--- a/tests/integration/test_lldpcli.py
+++ b/tests/integration/test_lldpcli.py
@@ -4,6 +4,7 @@ import re
 import platform
 import json
 import xml.etree.ElementTree as ET
+from flaky import flaky
 
 
 @pytest.fixture(scope='session')
@@ -189,6 +190,7 @@ 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()