tests: skip tests failing on ubuntu 22.04

Type: test

Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
Change-Id: I218059de5d05680d661f302293475b6c2a7bf81d
This commit is contained in:
Dave Wallace
2022-09-18 22:28:44 -04:00
committed by Andrew Yourtchenko
parent a58dae61ae
commit e95b246c7b
4 changed files with 87 additions and 2 deletions

View File

@@ -200,6 +200,17 @@ 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()
class KeepAliveReporter(object):
"""
Singleton object which reports test start to parent process
@@ -245,6 +256,8 @@ 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
def create_tag_decorator(e):
@@ -261,6 +274,7 @@ 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)
class DummyVpp:
@@ -335,6 +349,12 @@ class VppTestCase(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 distro is ubuntu 22.04 and @tag_fixme_ubuntu2204 mark for skip"""
if cls.has_tag(TestCaseTag.FIXME_UBUNTU2204):
cls = unittest.skip("Skipping @tag_fixme_ubuntu2204 tests")(cls)
@classmethod
def instance(cls):
"""Return the instance of this testcase"""
@@ -1749,6 +1769,12 @@ class VppTestResult(unittest.TestResult):
test_title = colorize(f"FIXME with ASAN: {test_title}", RED)
test.skip_fixme_asan()
if is_distro_ubuntu2204 == True and test.has_tag(
TestCaseTag.FIXME_UBUNTU2204
):
test_title = colorize(f"FIXME on 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]"

File diff suppressed because it is too large Load Diff

View File

@@ -8,7 +8,7 @@ from scapy.packet import Raw, bind_layers
from scapy.layers.inet import IP, UDP
from scapy.layers.inet6 import IPv6
from scapy.contrib.mpls import MPLS
from framework import tag_fixme_vpp_workers
from framework import tag_fixme_vpp_workers, tag_fixme_ubuntu2204
from framework import VppTestRunner
from template_ipsec import (
TemplateIpsec,
@@ -944,6 +944,7 @@ class TestIpsec4MultiTunIfEsp(TemplateIpsec4TunProtect, TemplateIpsec, IpsecTun4
self.verify_encrypted(p, p.vpp_tun_sa, [rx])
@tag_fixme_ubuntu2204
class TestIpsec4TunIfEspAll(TemplateIpsec4TunProtect, TemplateIpsec, IpsecTun4):
"""IPsec IPv4 Tunnel interface all Algos"""

View File

@@ -6,7 +6,7 @@ import os
import subprocess
import signal
from config import config
from framework import tag_fixme_vpp_workers
from framework import tag_fixme_vpp_workers, tag_fixme_ubuntu2204
from framework import VppTestCase, VppTestRunner, Worker
from vpp_ip_route import VppIpTable, VppIpRoute, VppRoutePath
@@ -52,6 +52,7 @@ class QUICAppWorker(Worker):
return False
@tag_fixme_ubuntu2204
class QUICTestCase(VppTestCase):
"""QUIC Test Case"""