summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Smith <mgsmith@netgate.com>2020-03-12 10:29:31 -0500
committerMatthew Smith <mgsmith@netgate.com>2020-03-12 10:52:08 -0500
commit30fa5d1e17d59e7a48e19c03029fe0028c17fc6a (patch)
tree2df00720d0bee35d57a07767eade3c70008b5e34
parentce266ad574c4145e837c716c46ef0ef6b02620ce (diff)
vrrp: unit tests do not run by default
Type: fix Fixes: 39e9428b90 VRRP unit tests fail sometimes for changes which have not touched any code related to VRRP. There were some timing-related changes recently which probably made the VRRP tests, which rely on a VR changing state within a certain amount of time, start failing. Set the VRRP tests to only run with the extended tests rather than running by default. This is temporary so VRRP will not cause spurious build failures while a proper solution is figured out. Change-Id: I5826ea39b944dfb9b0ca4bdfa2ebbe86d269f935 Signed-off-by: Matthew Smith <mgsmith@netgate.com>
-rw-r--r--src/plugins/vrrp/test/test_vrrp.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/vrrp/test/test_vrrp.py b/src/plugins/vrrp/test/test_vrrp.py
index cc46a1de5f4..cd2aeb10ec3 100644
--- a/src/plugins/vrrp/test/test_vrrp.py
+++ b/src/plugins/vrrp/test/test_vrrp.py
@@ -22,7 +22,7 @@ from scapy.layers.inet6 import IPv6, ipv6nh, IPv6ExtHdrHopByHop, \
from scapy.contrib.igmpv3 import IGMPv3, IGMPv3mr, IGMPv3gr
from scapy.layers.vrrp import IPPROTO_VRRP, VRRPv3
from scapy.utils6 import in6_getnsma, in6_getnsmac
-from framework import VppTestCase, VppTestRunner
+from framework import VppTestCase, VppTestRunner, running_extended_tests
from util import ip6_normalize
VRRP_VR_FLAG_PREEMPT = 1
@@ -214,6 +214,7 @@ class VppVRRPVirtualRouter(VppObject):
return (vr_details.runtime.master_down_int * 0.01)
+@unittest.skipUnless(running_extended_tests, "part of extended tests")
class TestVRRP4(VppTestCase):
""" IPv4 VRRP Test Case """
@@ -746,6 +747,7 @@ class TestVRRP4(VppTestCase):
self.assertEqual(rx[VRRPv3].addrlist, [vip])
+@unittest.skipUnless(running_extended_tests, "part of extended tests")
class TestVRRP6(VppTestCase):
""" IPv6 VRRP Test Case """