From a095e37d2a39c1194111938ecb862838f224c172 Mon Sep 17 00:00:00 2001 From: Andrew Yourtchenko Date: Tue, 2 Jul 2024 18:02:09 +0200 Subject: 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 (cherry picked from commit 9987d470a6a502dd64266204cb006f30d7245cdd) --- test/asf/asfframework.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'test/asf/asfframework.py') 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 @@ -316,6 +316,12 @@ class VppAsfTestCase(CPUInterface, unittest.TestCase): if "DVPP_ENABLE_SANITIZE_ADDR=ON" in vpp_extra_cmake_args: 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""" @@ -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]" -- cgit 1.2.3-korg