diff options
| -rw-r--r-- | test/asf/asfframework.py | 33 | ||||
| -rw-r--r-- | test/test_flowprobe.py | 1 | ||||
| -rw-r--r-- | test/test_nat44_ed.py | 2 | ||||
| -rw-r--r-- | test/test_nat64.py | 1 | ||||
| -rw-r--r-- | test/test_neighbor.py | 5 |
5 files changed, 7 insertions, 35 deletions
diff --git a/test/asf/asfframework.py b/test/asf/asfframework.py index bd1b45c6476..c9c20106086 100644 --- a/test/asf/asfframework.py +++ b/test/asf/asfframework.py @@ -155,17 +155,6 @@ def _is_platform_aarch64(): is_platform_aarch64 = _is_platform_aarch64() -def _is_distro_ubuntu2204(): - with open("/etc/os-release") as f: - for line in f.readlines(): - if "jammy" in line: - return True - return False - - -is_distro_ubuntu2204 = _is_distro_ubuntu2204() - - def _is_distro_ubuntu2404(): with open("/etc/os-release") as f: for line in f.readlines(): @@ -233,14 +222,12 @@ class TestCaseTag(Enum): FIXME_VPP_WORKERS = 2 # marks the suites broken when ASan is enabled FIXME_ASAN = 3 - # marks suites broken on Ubuntu-22.04 - FIXME_UBUNTU2204 = 4 # marks suites broken on Debian-11 - FIXME_DEBIAN11 = 5 + FIXME_DEBIAN11 = 4 # marks suites broken on debug vpp image - FIXME_VPP_DEBUG = 6 + FIXME_VPP_DEBUG = 5 # marks suites broken on Ubuntu-24.04 - FIXME_UBUNTU2404 = 7 + FIXME_UBUNTU2404 = 6 def create_tag_decorator(e): @@ -257,7 +244,6 @@ def create_tag_decorator(e): tag_run_solo = create_tag_decorator(TestCaseTag.RUN_SOLO) tag_fixme_vpp_workers = create_tag_decorator(TestCaseTag.FIXME_VPP_WORKERS) tag_fixme_asan = create_tag_decorator(TestCaseTag.FIXME_ASAN) -tag_fixme_ubuntu2204 = create_tag_decorator(TestCaseTag.FIXME_UBUNTU2204) tag_fixme_debian11 = create_tag_decorator(TestCaseTag.FIXME_DEBIAN11) tag_fixme_vpp_debug = create_tag_decorator(TestCaseTag.FIXME_VPP_DEBUG) tag_fixme_ubuntu2404 = create_tag_decorator(TestCaseTag.FIXME_UBUNTU2404) @@ -323,12 +309,6 @@ 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 skip_fixme_ubuntu2404(cls): """if @tag_fixme_ubuntu2404 & is Ubuntu24.04 - mark for skip""" if cls.has_tag(TestCaseTag.FIXME_UBUNTU2404) and is_distro_ubuntu2404 == True: @@ -1382,13 +1362,6 @@ class VppTestResult(unittest.TestResult): 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 ( test.has_tag(TestCaseTag.FIXME_UBUNTU2404) and is_distro_ubuntu2404 == True ): diff --git a/test/test_flowprobe.py b/test/test_flowprobe.py index 18a2e3a36c2..bf77f154907 100644 --- a/test/test_flowprobe.py +++ b/test/test_flowprobe.py @@ -18,7 +18,6 @@ from asfframework import ( tag_fixme_vpp_workers, tag_fixme_debian11, tag_run_solo, - is_distro_ubuntu2204, is_distro_debian11, VppTestRunner, ) diff --git a/test/test_nat44_ed.py b/test/test_nat44_ed.py index 83629bb185b..233881424d4 100644 --- a/test/test_nat44_ed.py +++ b/test/test_nat44_ed.py @@ -7,7 +7,7 @@ from random import randint, choice import re import scapy.compat from framework import VppTestCase, VppLoInterface -from asfframework import VppTestRunner, is_distro_ubuntu2204 +from asfframework import VppTestRunner from scapy.data import IP_PROTOS from scapy.layers.inet import IP, TCP, UDP, ICMP, GRE from scapy.layers.inet import IPerror, TCPerror diff --git a/test/test_nat64.py b/test/test_nat64.py index 0ddce3d23ec..0eb57ee9cce 100644 --- a/test/test_nat64.py +++ b/test/test_nat64.py @@ -12,7 +12,6 @@ from config import config from framework import VppTestCase from asfframework import ( tag_fixme_vpp_workers, - is_distro_ubuntu2204, VppTestRunner, ) from ipfix import IPFIX, Set, Template, Data, IPFIXDecoder diff --git a/test/test_neighbor.py b/test/test_neighbor.py index d11d4abac14..731005b5d65 100644 --- a/test/test_neighbor.py +++ b/test/test_neighbor.py @@ -3,8 +3,9 @@ import unittest import os +from config import config from framework import VppTestCase -from asfframework import VppTestRunner, tag_fixme_vpp_workers, tag_fixme_ubuntu2204 +from asfframework import VppTestRunner, tag_fixme_vpp_workers from vpp_neighbor import VppNeighbor, find_nbr from vpp_ip_route import ( VppIpRoute, @@ -2330,7 +2331,7 @@ class NeighborStatsTestCase(VppTestCase): self.assertEqual(NUM_PKTS + 16, nd1.get_stats()["packets"]) -@tag_fixme_ubuntu2204 +@unittest.skipUnless(config.extended, "part of extended tests") class NeighborAgeTestCase(VppTestCase): """ARP/ND Aging""" |