tests: disable failing tests on Ubuntu 22.04
Also rework the logic so the skipping of marked Ubuntu 22.04 occurs at framework level
Leave debian11 special cases as-is.
Type: fix
Change-Id: I481eb32cd1a0860935482e9f930ced409da653c9
Signed-off-by: Andrew Yourtchenko <ayourtch@gmail.com>
diff --git a/test/test_ikev2.py b/test/test_ikev2.py
index fd065b4..ea425e2 100644
--- a/test/test_ikev2.py
+++ b/test/test_ikev2.py
@@ -2036,6 +2036,7 @@
@tag_fixme_vpp_workers
+@tag_fixme_ubuntu2204
class TestInitiatorNATT(TemplateInitiator, Ikev2Params):
"""test ikev2 initiator - NAT traversal (intitiator behind NAT)"""
@@ -2068,6 +2069,7 @@
@tag_fixme_vpp_workers
+@tag_fixme_ubuntu2204
class TestInitiatorPsk(TemplateInitiator, Ikev2Params):
"""test ikev2 initiator - pre shared key auth"""
@@ -2099,6 +2101,7 @@
@tag_fixme_vpp_workers
+@tag_fixme_ubuntu2204
class TestInitiatorRequestWindowSize(TestInitiatorPsk):
"""test initiator - request window size (1)"""
@@ -2148,6 +2151,7 @@
@tag_fixme_vpp_workers
+@tag_fixme_ubuntu2204
class TestInitiatorRekey(TestInitiatorPsk):
"""test ikev2 initiator - rekey"""
@@ -2193,6 +2197,7 @@
@tag_fixme_vpp_workers
+@tag_fixme_ubuntu2204
class TestInitiatorDelSAFromResponder(TemplateInitiator, Ikev2Params):
"""test ikev2 initiator - delete IKE SA from responder"""
@@ -2413,9 +2418,7 @@
globals()["ikev2"] = _ikev2
super(IkePeer, cls).setUpClass()
- if (is_distro_ubuntu2204 == True or is_distro_debian11 == True) and not hasattr(
- cls, "vpp"
- ):
+ if (is_distro_debian11 == True) and not hasattr(cls, "vpp"):
return
cls.create_pg_interfaces(range(1))
cls.vapi.cli("ip table add 1")
@@ -2525,6 +2528,7 @@
@tag_fixme_vpp_workers
+@tag_fixme_ubuntu2204
class TestInitiatorKeepaliveMsg(TestInitiatorPsk):
"""
Test for keep alive messages