diff options
| -rw-r--r-- | test/asf/asfframework.py | 13 | ||||
| -rw-r--r-- | test/test_flowprobe.py | 4 | ||||
| -rw-r--r-- | test/test_ikev2.py | 10 | ||||
| -rw-r--r-- | test/test_nat44_ed.py | 2 | ||||
| -rw-r--r-- | test/test_nat64.py | 2 |
5 files changed, 21 insertions, 10 deletions
diff --git a/test/asf/asfframework.py b/test/asf/asfframework.py index 24880044cec..4cd4d94ab7b 100644 --- a/test/asf/asfframework.py +++ b/test/asf/asfframework.py @@ -317,6 +317,12 @@ class VppAsfTestCase(CPUInterface, unittest.TestCase): cls = unittest.skip("Skipping @tag_fixme_asan tests")(cls) @classmethod + def skip_fixme_ubuntu2204(cls): + """if @tag_fixme_ubuntu2204 & is Ubuntu22.04 - mark for skip""" + if cls.has_tag(TestCaseTag.FIXME_UBUNTU2204) and is_distro_ubuntu2204 == True: + cls = unittest.skip("Skipping @tag_fixme_ubuntu2204 tests")(cls) + + @classmethod def instance(cls): """Return the instance of this testcase""" return cls.test_instance @@ -1361,6 +1367,13 @@ class VppTestResult(unittest.TestResult): test_title = colorize(f"FIXME with ASAN: {test_title}", RED) test.skip_fixme_asan() + if ( + test.has_tag(TestCaseTag.FIXME_UBUNTU2204) + and is_distro_ubuntu2204 == True + ): + test_title = colorize(f"FIXME with Ubuntu 22.04: {test_title}", RED) + test.skip_fixme_ubuntu2204() + if hasattr(test, "vpp_worker_count"): if test.vpp_worker_count == 0: test_title += " [main thread only]" diff --git a/test/test_flowprobe.py b/test/test_flowprobe.py index ac0433abc00..4fd9c6f2320 100644 --- a/test/test_flowprobe.py +++ b/test/test_flowprobe.py @@ -183,9 +183,7 @@ class MethodHolder(VppTestCase): variables and configure VPP. """ super(MethodHolder, 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 try: # Create pg interfaces diff --git a/test/test_ikev2.py b/test/test_ikev2.py index 30ee2b98110..3fb88b87e83 100644 --- a/test/test_ikev2.py +++ b/test/test_ikev2.py @@ -1872,6 +1872,7 @@ class TestResponderBehindNAT(TemplateResponder, Ikev2Params): @tag_fixme_vpp_workers +@tag_fixme_ubuntu2204 class TestInitiatorNATT(TemplateInitiator, Ikev2Params): """test ikev2 initiator - NAT traversal (intitiator behind NAT)""" @@ -1904,6 +1905,7 @@ class TestInitiatorNATT(TemplateInitiator, Ikev2Params): @tag_fixme_vpp_workers +@tag_fixme_ubuntu2204 class TestInitiatorPsk(TemplateInitiator, Ikev2Params): """test ikev2 initiator - pre shared key auth""" @@ -1935,6 +1937,7 @@ class TestInitiatorPsk(TemplateInitiator, Ikev2Params): @tag_fixme_vpp_workers +@tag_fixme_ubuntu2204 class TestInitiatorRequestWindowSize(TestInitiatorPsk): """test initiator - request window size (1)""" @@ -1983,6 +1986,7 @@ class TestInitiatorRequestWindowSize(TestInitiatorPsk): @tag_fixme_vpp_workers +@tag_fixme_ubuntu2204 class TestInitiatorRekey(TestInitiatorPsk): """test ikev2 initiator - rekey""" @@ -2027,6 +2031,7 @@ class TestInitiatorRekey(TestInitiatorPsk): @tag_fixme_vpp_workers +@tag_fixme_ubuntu2204 class TestInitiatorDelSAFromResponder(TemplateInitiator, Ikev2Params): """test ikev2 initiator - delete IKE SA from responder""" @@ -2197,9 +2202,7 @@ class TestResponderVrf(TestResponderPsk, Ikev2Params): 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") @@ -2310,6 +2313,7 @@ class Test_IKE_AES_GCM_16_256(TemplateResponder, Ikev2Params): @tag_fixme_vpp_workers +@tag_fixme_ubuntu2204 class TestInitiatorKeepaliveMsg(TestInitiatorPsk): """ Test for keep alive messages diff --git a/test/test_nat44_ed.py b/test/test_nat44_ed.py index eed89f1a399..d3d6d07457b 100644 --- a/test/test_nat44_ed.py +++ b/test/test_nat44_ed.py @@ -162,8 +162,6 @@ class TestNAT44ED(VppTestCase): @classmethod def setUpClass(cls): super().setUpClass() - if is_distro_ubuntu2204 == True and not hasattr(cls, "vpp"): - return cls.create_pg_interfaces(range(12)) cls.interfaces = list(cls.pg_interfaces[:4]) diff --git a/test/test_nat64.py b/test/test_nat64.py index f650b8d5f43..7333181e7f0 100644 --- a/test/test_nat64.py +++ b/test/test_nat64.py @@ -55,8 +55,6 @@ class TestNAT64(VppTestCase): def setUpClass(cls): super(TestNAT64, cls).setUpClass() - if is_distro_ubuntu2204 == True and not hasattr(cls, "vpp"): - return cls.tcp_port_in = 6303 cls.tcp_port_out = 6303 cls.udp_port_in = 6304 |