commit e95b246c7b87bf2a1d51d2061c72a9824a6ff047
author Dave Wallace <dwallacelf@gmail.com> Sun Sep 18 22:28:44 2022 -0400
committer Andrew Yourtchenko <ayourtch@gmail.com> Mon Sep 19 13:59:05 2022 +0000
tree d2c230909f9ab5f1c9d3aed67b1824094767dfe1
parent a58dae61aea7e781a27ce65462dd38ab55e8599c

tests: skip tests failing on ubuntu 22.04

Type: test

Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
Change-Id: I218059de5d05680d661f302293475b6c2a7bf81d

test/framework.py

diff --git a/test/framework.py b/test/framework.py
index bfcc030..230b2d5 100644
--- a/test/framework.py
+++ b/test/framework.py
@@ -200,6 +200,17 @@
 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 @@
     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 @@
 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:
@@ -336,6 +350,12 @@
                 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"""
         return cls.test_instance
@@ -1749,6 +1769,12 @@
                 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]"

test/test_ipsec_esp.py

diff --git a/test/test_ipsec_esp.py b/test/test_ipsec_esp.py
index 90f013f..a894644 100644
--- a/test/test_ipsec_esp.py
+++ b/test/test_ipsec_esp.py
@@ -7,6 +7,7 @@
 from scapy.packet import Raw
 
 from parameterized import parameterized
+from framework import tag_fixme_ubuntu2204
 from framework import VppTestRunner
 from template_ipsec import (
     IpsecTra46Tests,
@@ -1235,6 +1236,7 @@
         self.run_test()
 
 
+@tag_fixme_ubuntu2204
 class Test_native_ESNon_ARon_AES_CBC_128_MD5_96(RunTestIpsecEspAll):
     """native ESNon ARon AES-CBC-128/MD5-96 IPSec test"""
 
@@ -1243,6 +1245,7 @@
         self.run_test()
 
 
+@tag_fixme_ubuntu2204
 class Test_native_ESNon_ARon_AES_CBC_192_SHA1_96(RunTestIpsecEspAll):
     """native ESNon ARon AES-CBC-192/SHA1-96 IPSec test"""
 
@@ -1251,6 +1254,7 @@
         self.run_test()
 
 
+@tag_fixme_ubuntu2204
 class Test_native_ESNon_ARon_AES_CBC_256_SHA1_96(RunTestIpsecEspAll):
     """native ESNon ARon AES-CBC-256/SHA1-96 IPSec test"""
 
@@ -1259,6 +1263,7 @@
         self.run_test()
 
 
+@tag_fixme_ubuntu2204
 class Test_native_ESNon_ARon_3DES_CBC_SHA1_96(RunTestIpsecEspAll):
     """native ESNon ARon 3DES-CBC/SHA1-96 IPSec test"""
 
@@ -1323,6 +1328,7 @@
         self.run_test()
 
 
+@tag_fixme_ubuntu2204
 class Test_native_ESNon_ARoff_AES_CBC_128_MD5_96(RunTestIpsecEspAll):
     """native ESNon ARoff AES-CBC-128/MD5-96 IPSec test"""
 
@@ -1331,6 +1337,7 @@
         self.run_test()
 
 
+@tag_fixme_ubuntu2204
 class Test_native_ESNon_ARoff_AES_CBC_192_SHA1_96(RunTestIpsecEspAll):
     """native ESNon ARoff AES-CBC-192/SHA1-96 IPSec test"""
 
@@ -1339,6 +1346,7 @@
         self.run_test()
 
 
+@tag_fixme_ubuntu2204
 class Test_native_ESNon_ARoff_AES_CBC_256_SHA1_96(RunTestIpsecEspAll):
     """native ESNon ARoff AES-CBC-256/SHA1-96 IPSec test"""
 
@@ -1347,6 +1355,7 @@
         self.run_test()
 
 
+@tag_fixme_ubuntu2204
 class Test_native_ESNon_ARoff_3DES_CBC_SHA1_96(RunTestIpsecEspAll):
     """native ESNon ARoff 3DES-CBC/SHA1-96 IPSec test"""
 
@@ -1411,6 +1420,7 @@
         self.run_test()
 
 
+@tag_fixme_ubuntu2204
 class Test_native_ESNoff_ARon_AES_CBC_128_MD5_96(RunTestIpsecEspAll):
     """native ESNoff ARon AES-CBC-128/MD5-96 IPSec test"""
 
@@ -1419,6 +1429,7 @@
         self.run_test()
 
 
+@tag_fixme_ubuntu2204
 class Test_native_ESNoff_ARon_AES_CBC_192_SHA1_96(RunTestIpsecEspAll):
     """native ESNoff ARon AES-CBC-192/SHA1-96 IPSec test"""
 
@@ -1427,6 +1438,7 @@
         self.run_test()
 
 
+@tag_fixme_ubuntu2204
 class Test_native_ESNoff_ARon_AES_CBC_256_SHA1_96(RunTestIpsecEspAll):
     """native ESNoff ARon AES-CBC-256/SHA1-96 IPSec test"""
 
@@ -1435,6 +1447,7 @@
         self.run_test()
 
 
+@tag_fixme_ubuntu2204
 class Test_native_ESNoff_ARon_3DES_CBC_SHA1_96(RunTestIpsecEspAll):
     """native ESNoff ARon 3DES-CBC/SHA1-96 IPSec test"""
 
@@ -1499,6 +1512,7 @@
         self.run_test()
 
 
+@tag_fixme_ubuntu2204
 class Test_native_ESNoff_ARoff_AES_CBC_128_MD5_96(RunTestIpsecEspAll):
     """native ESNoff ARoff AES-CBC-128/MD5-96 IPSec test"""
 
@@ -1507,6 +1521,7 @@
         self.run_test()
 
 
+@tag_fixme_ubuntu2204
 class Test_native_ESNoff_ARoff_AES_CBC_192_SHA1_96(RunTestIpsecEspAll):
     """native ESNoff ARoff AES-CBC-192/SHA1-96 IPSec test"""
 
@@ -1515,6 +1530,7 @@
         self.run_test()
 
 
+@tag_fixme_ubuntu2204
 class Test_native_ESNoff_ARoff_AES_CBC_256_SHA1_96(RunTestIpsecEspAll):
     """native ESNoff ARoff AES-CBC-256/SHA1-96 IPSec test"""
 
@@ -1523,6 +1539,7 @@
         self.run_test()
 
 
+@tag_fixme_ubuntu2204
 class Test_native_ESNoff_ARoff_3DES_CBC_SHA1_96(RunTestIpsecEspAll):
     """native ESNoff ARoff 3DES-CBC/SHA1-96 IPSec test"""
 
@@ -1587,6 +1604,7 @@
         self.run_test()
 
 
+@tag_fixme_ubuntu2204
 class Test_ipsecmb_ESNon_ARon_AES_CBC_128_MD5_96(RunTestIpsecEspAll):
     """ipsecmb ESNon ARon AES-CBC-128/MD5-96 IPSec test"""
 
@@ -1595,6 +1613,7 @@
         self.run_test()
 
 
+@tag_fixme_ubuntu2204
 class Test_ipsecmb_ESNon_ARon_AES_CBC_192_SHA1_96(RunTestIpsecEspAll):
     """ipsecmb ESNon ARon AES-CBC-192/SHA1-96 IPSec test"""
 
@@ -1603,6 +1622,7 @@
         self.run_test()
 
 
+@tag_fixme_ubuntu2204
 class Test_ipsecmb_ESNon_ARon_AES_CBC_256_SHA1_96(RunTestIpsecEspAll):
     """ipsecmb ESNon ARon AES-CBC-256/SHA1-96 IPSec test"""
 
@@ -1611,6 +1631,7 @@
         self.run_test()
 
 
+@tag_fixme_ubuntu2204
 class Test_ipsecmb_ESNon_ARon_3DES_CBC_SHA1_96(RunTestIpsecEspAll):
     """ipsecmb ESNon ARon 3DES-CBC/SHA1-96 IPSec test"""
 
@@ -1675,6 +1696,7 @@
         self.run_test()
 
 
+@tag_fixme_ubuntu2204
 class Test_ipsecmb_ESNon_ARoff_AES_CBC_128_MD5_96(RunTestIpsecEspAll):
     """ipsecmb ESNon ARoff AES-CBC-128/MD5-96 IPSec test"""
 
@@ -1683,6 +1705,7 @@
         self.run_test()
 
 
+@tag_fixme_ubuntu2204
 class Test_ipsecmb_ESNon_ARoff_AES_CBC_192_SHA1_96(RunTestIpsecEspAll):
     """ipsecmb ESNon ARoff AES-CBC-192/SHA1-96 IPSec test"""
 
@@ -1691,6 +1714,7 @@
         self.run_test()
 
 
+@tag_fixme_ubuntu2204
 class Test_ipsecmb_ESNon_ARoff_AES_CBC_256_SHA1_96(RunTestIpsecEspAll):
     """ipsecmb ESNon ARoff AES-CBC-256/SHA1-96 IPSec test"""
 
@@ -1699,6 +1723,7 @@
         self.run_test()
 
 
+@tag_fixme_ubuntu2204
 class Test_ipsecmb_ESNon_ARoff_3DES_CBC_SHA1_96(RunTestIpsecEspAll):
     """ipsecmb ESNon ARoff 3DES-CBC/SHA1-96 IPSec test"""
 
@@ -1763,6 +1788,7 @@
         self.run_test()
 
 
+@tag_fixme_ubuntu2204
 class Test_ipsecmb_ESNoff_ARon_AES_CBC_128_MD5_96(RunTestIpsecEspAll):
     """ipsecmb ESNoff ARon AES-CBC-128/MD5-96 IPSec test"""
 
@@ -1771,6 +1797,7 @@
         self.run_test()
 
 
+@tag_fixme_ubuntu2204
 class Test_ipsecmb_ESNoff_ARon_AES_CBC_192_SHA1_96(RunTestIpsecEspAll):
     """ipsecmb ESNoff ARon AES-CBC-192/SHA1-96 IPSec test"""
 
@@ -1779,6 +1806,7 @@
         self.run_test()
 
 
+@tag_fixme_ubuntu2204
 class Test_ipsecmb_ESNoff_ARon_AES_CBC_256_SHA1_96(RunTestIpsecEspAll):
     """ipsecmb ESNoff ARon AES-CBC-256/SHA1-96 IPSec test"""
 
@@ -1787,6 +1815,7 @@
         self.run_test()
 
 
+@tag_fixme_ubuntu2204
 class Test_ipsecmb_ESNoff_ARon_3DES_CBC_SHA1_96(RunTestIpsecEspAll):
     """ipsecmb ESNoff ARon 3DES-CBC/SHA1-96 IPSec test"""
 
@@ -1851,6 +1880,7 @@
         self.run_test()
 
 
+@tag_fixme_ubuntu2204
 class Test_ipsecmb_ESNoff_ARoff_AES_CBC_128_MD5_96(RunTestIpsecEspAll):
     """ipsecmb ESNoff ARoff AES-CBC-128/MD5-96 IPSec test"""
 
@@ -1859,6 +1889,7 @@
         self.run_test()
 
 
+@tag_fixme_ubuntu2204
 class Test_ipsecmb_ESNoff_ARoff_AES_CBC_192_SHA1_96(RunTestIpsecEspAll):
     """ipsecmb ESNoff ARoff AES-CBC-192/SHA1-96 IPSec test"""
 
@@ -1867,6 +1898,7 @@
         self.run_test()
 
 
+@tag_fixme_ubuntu2204
 class Test_ipsecmb_ESNoff_ARoff_AES_CBC_256_SHA1_96(RunTestIpsecEspAll):
     """ipsecmb ESNoff ARoff AES-CBC-256/SHA1-96 IPSec test"""
 
@@ -1875,6 +1907,7 @@
         self.run_test()
 
 
+@tag_fixme_ubuntu2204
 class Test_ipsecmb_ESNoff_ARoff_3DES_CBC_SHA1_96(RunTestIpsecEspAll):
     """ipsecmb ESNoff ARoff 3DES-CBC/SHA1-96 IPSec test"""
 
@@ -1939,6 +1972,7 @@
         self.run_test()
 
 
+@tag_fixme_ubuntu2204
 class Test_openssl_ESNon_ARon_AES_CBC_128_MD5_96(RunTestIpsecEspAll):
     """openssl ESNon ARon AES-CBC-128/MD5-96 IPSec test"""
 
@@ -1947,6 +1981,7 @@
         self.run_test()
 
 
+@tag_fixme_ubuntu2204
 class Test_openssl_ESNon_ARon_AES_CBC_192_SHA1_96(RunTestIpsecEspAll):
     """openssl ESNon ARon AES-CBC-192/SHA1-96 IPSec test"""
 
@@ -1955,6 +1990,7 @@
         self.run_test()
 
 
+@tag_fixme_ubuntu2204
 class Test_openssl_ESNon_ARon_AES_CBC_256_SHA1_96(RunTestIpsecEspAll):
     """openssl ESNon ARon AES-CBC-256/SHA1-96 IPSec test"""
 
@@ -1963,6 +1999,7 @@
         self.run_test()
 
 
+@tag_fixme_ubuntu2204
 class Test_openssl_ESNon_ARon_3DES_CBC_SHA1_96(RunTestIpsecEspAll):
     """openssl ESNon ARon 3DES-CBC/SHA1-96 IPSec test"""
 
@@ -2027,6 +2064,7 @@
         self.run_test()
 
 
+@tag_fixme_ubuntu2204
 class Test_openssl_ESNon_ARoff_AES_CBC_128_MD5_96(RunTestIpsecEspAll):
     """openssl ESNon ARoff AES-CBC-128/MD5-96 IPSec test"""
 
@@ -2035,6 +2073,7 @@
         self.run_test()
 
 
+@tag_fixme_ubuntu2204
 class Test_openssl_ESNon_ARoff_AES_CBC_192_SHA1_96(RunTestIpsecEspAll):
     """openssl ESNon ARoff AES-CBC-192/SHA1-96 IPSec test"""
 
@@ -2043,6 +2082,7 @@
         self.run_test()
 
 
+@tag_fixme_ubuntu2204
 class Test_openssl_ESNon_ARoff_AES_CBC_256_SHA1_96(RunTestIpsecEspAll):
     """openssl ESNon ARoff AES-CBC-256/SHA1-96 IPSec test"""
 
@@ -2051,6 +2091,7 @@
         self.run_test()
 
 
+@tag_fixme_ubuntu2204
 class Test_openssl_ESNon_ARoff_3DES_CBC_SHA1_96(RunTestIpsecEspAll):
     """openssl ESNon ARoff 3DES-CBC/SHA1-96 IPSec test"""
 
@@ -2115,6 +2156,7 @@
         self.run_test()
 
 
+@tag_fixme_ubuntu2204
 class Test_openssl_ESNoff_ARon_AES_CBC_128_MD5_96(RunTestIpsecEspAll):
     """openssl ESNoff ARon AES-CBC-128/MD5-96 IPSec test"""
 
@@ -2123,6 +2165,7 @@
         self.run_test()
 
 
+@tag_fixme_ubuntu2204
 class Test_openssl_ESNoff_ARon_AES_CBC_192_SHA1_96(RunTestIpsecEspAll):
     """openssl ESNoff ARon AES-CBC-192/SHA1-96 IPSec test"""
 
@@ -2131,6 +2174,7 @@
         self.run_test()
 
 
+@tag_fixme_ubuntu2204
 class Test_openssl_ESNoff_ARon_AES_CBC_256_SHA1_96(RunTestIpsecEspAll):
     """openssl ESNoff ARon AES-CBC-256/SHA1-96 IPSec test"""
 
@@ -2139,6 +2183,7 @@
         self.run_test()
 
 
+@tag_fixme_ubuntu2204
 class Test_openssl_ESNoff_ARon_3DES_CBC_SHA1_96(RunTestIpsecEspAll):
     """openssl ESNoff ARon 3DES-CBC/SHA1-96 IPSec test"""
 
@@ -2203,6 +2248,7 @@
         self.run_test()
 
 
+@tag_fixme_ubuntu2204
 class Test_openssl_ESNoff_ARoff_AES_CBC_128_MD5_96(RunTestIpsecEspAll):
     """openssl ESNoff ARoff AES-CBC-128/MD5-96 IPSec test"""
 
@@ -2211,6 +2257,7 @@
         self.run_test()
 
 
+@tag_fixme_ubuntu2204
 class Test_openssl_ESNoff_ARoff_AES_CBC_192_SHA1_96(RunTestIpsecEspAll):
     """openssl ESNoff ARoff AES-CBC-192/SHA1-96 IPSec test"""
 
@@ -2219,6 +2266,7 @@
         self.run_test()
 
 
+@tag_fixme_ubuntu2204
 class Test_openssl_ESNoff_ARoff_AES_CBC_256_SHA1_96(RunTestIpsecEspAll):
     """openssl ESNoff ARoff AES-CBC-256/SHA1-96 IPSec test"""
 
@@ -2227,6 +2275,7 @@
         self.run_test()
 
 
+@tag_fixme_ubuntu2204
 class Test_openssl_ESNoff_ARoff_3DES_CBC_SHA1_96(RunTestIpsecEspAll):
     """openssl ESNoff ARoff 3DES-CBC/SHA1-96 IPSec test"""
 
@@ -2291,6 +2340,7 @@
         self.run_test()
 
 
+@tag_fixme_ubuntu2204
 class Test_async_ESNon_ARon_AES_CBC_192_SHA1_96(RunTestIpsecEspAll):
     """async ESNon ARon AES-CBC-192/SHA1-96 IPSec test"""
 
@@ -2299,6 +2349,7 @@
         self.run_test()
 
 
+@tag_fixme_ubuntu2204
 class Test_async_ESNon_ARon_AES_CBC_256_SHA1_96(RunTestIpsecEspAll):
     """async ESNon ARon AES-CBC-256/SHA1-96 IPSec test"""
 
@@ -2331,6 +2382,7 @@
         self.run_test()
 
 
+@tag_fixme_ubuntu2204
 class Test_async_ESNon_ARoff_AES_CBC_192_SHA1_96(RunTestIpsecEspAll):
     """async ESNon ARoff AES-CBC-192/SHA1-96 IPSec test"""
 
@@ -2339,6 +2391,7 @@
         self.run_test()
 
 
+@tag_fixme_ubuntu2204
 class Test_async_ESNon_ARoff_AES_CBC_256_SHA1_96(RunTestIpsecEspAll):
     """async ESNon ARoff AES-CBC-256/SHA1-96 IPSec test"""
 
@@ -2371,6 +2424,7 @@
         self.run_test()
 
 
+@tag_fixme_ubuntu2204
 class Test_async_ESNoff_ARon_AES_CBC_192_SHA1_96(RunTestIpsecEspAll):
     """async ESNoff ARon AES-CBC-192/SHA1-96 IPSec test"""
 
@@ -2379,6 +2433,7 @@
         self.run_test()
 
 
+@tag_fixme_ubuntu2204
 class Test_async_ESNoff_ARon_AES_CBC_256_SHA1_96(RunTestIpsecEspAll):
     """async ESNoff ARon AES-CBC-256/SHA1-96 IPSec test"""
 
@@ -2411,6 +2466,7 @@
         self.run_test()
 
 
+@tag_fixme_ubuntu2204
 class Test_async_ESNoff_ARoff_AES_CBC_192_SHA1_96(RunTestIpsecEspAll):
     """async ESNoff ARoff AES-CBC-192/SHA1-96 IPSec test"""
 
@@ -2419,6 +2475,7 @@
         self.run_test()
 
 
+@tag_fixme_ubuntu2204
 class Test_async_ESNoff_ARoff_AES_CBC_256_SHA1_96(RunTestIpsecEspAll):
     """async ESNoff ARoff AES-CBC-256/SHA1-96 IPSec test"""
 

test/test_ipsec_tun_if_esp.py

diff --git a/test/test_ipsec_tun_if_esp.py b/test/test_ipsec_tun_if_esp.py
index 61a66d4..5aa304d 100644
--- a/test/test_ipsec_tun_if_esp.py
+++ b/test/test_ipsec_tun_if_esp.py
@@ -8,7 +8,7 @@
 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 @@
             self.verify_encrypted(p, p.vpp_tun_sa, [rx])
 
 
+@tag_fixme_ubuntu2204
 class TestIpsec4TunIfEspAll(TemplateIpsec4TunProtect, TemplateIpsec, IpsecTun4):
     """IPsec IPv4 Tunnel interface all Algos"""
 

test/test_quic.py

diff --git a/test/test_quic.py b/test/test_quic.py
index 6651d74..e7224bc 100644
--- a/test/test_quic.py
+++ b/test/test_quic.py
@@ -6,7 +6,7 @@
 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 @@
         return False
 
 
+@tag_fixme_ubuntu2204
 class QUICTestCase(VppTestCase):
     """QUIC Test Case"""