diff options
Diffstat (limited to 'test/asf')
| -rw-r--r-- | test/asf/asfframework.py | 33 |
1 files changed, 3 insertions, 30 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 ): |