From 8dc0d488e62323a6f2814a74130934f5ed2bf724 Mon Sep 17 00:00:00 2001 From: Andrew Yourtchenko Date: Fri, 29 Jan 2021 13:17:19 +0000 Subject: tests: tag the tests that do not work with multi-worker configuration If the multi-worker default VPP configuration is triggered by setting VPP_WORKER_CONFIG="workers 2", some of the tests fail for various reasons. It's a substantial number, so this change marks all of the testsets that have this issue, such that they can be addressed later independently. Type: test Change-Id: I4f77196499edef3300afe7eabef9cbff91f794d3 Signed-off-by: Andrew Yourtchenko --- test/test_ip4.py | 2 ++ test/test_ip_mcast.py | 2 ++ test/test_ipsec_tun_if_esp.py | 10 ++++++++++ test/test_mpls.py | 2 ++ test/test_neighbor.py | 2 ++ test/test_punt.py | 2 ++ test/test_session.py | 3 +++ test/test_stats_client.py | 2 ++ test/test_tcp.py | 2 ++ test/test_udp.py | 3 +++ 10 files changed, 30 insertions(+) (limited to 'test') diff --git a/test/test_ip4.py b/test/test_ip4.py index 47f0af30452..f0b43947736 100644 --- a/test/test_ip4.py +++ b/test/test_ip4.py @@ -11,6 +11,7 @@ from scapy.layers.l2 import Ether, Dot1Q, ARP from scapy.packet import Raw from six import moves +from framework import tag_fixme_vpp_workers from framework import VppTestCase, VppTestRunner from util import ppp from vpp_ip_route import VppIpRoute, VppRoutePath, VppIpMRoute, \ @@ -2095,6 +2096,7 @@ class TestIPLPM(VppTestCase): rx = self.send_and_expect(self.pg0, p_24 * NUM_PKTS, self.pg1) +@tag_fixme_vpp_workers class TestIPv4Frag(VppTestCase): """ IPv4 fragmentation """ diff --git a/test/test_ip_mcast.py b/test/test_ip_mcast.py index d0ca1f6f161..2799218125c 100644 --- a/test/test_ip_mcast.py +++ b/test/test_ip_mcast.py @@ -2,6 +2,7 @@ import unittest +from framework import tag_fixme_vpp_workers from framework import VppTestCase, VppTestRunner from vpp_ip import DpoProto from vpp_ip_route import VppIpMRoute, VppMRoutePath, VppMFibSignal, \ @@ -47,6 +48,7 @@ class TestMFIB(VppTestCase): self.assertNotIn("Failed", error) +@tag_fixme_vpp_workers class TestIPMcast(VppTestCase): """ IP Multicast Test Case """ diff --git a/test/test_ipsec_tun_if_esp.py b/test/test_ipsec_tun_if_esp.py index 2ef1351ae7f..49c4d63161d 100644 --- a/test/test_ipsec_tun_if_esp.py +++ b/test/test_ipsec_tun_if_esp.py @@ -8,6 +8,7 @@ from scapy.packet import Raw 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 VppTestRunner from template_ipsec import TemplateIpsec, IpsecTun4Tests, IpsecTun6Tests, \ IpsecTun4, IpsecTun6, IpsecTcpTests, mk_scapy_crypt_key, \ @@ -476,6 +477,7 @@ class TestIpsec4TunIfEspHandoff(TemplateIpsec4TunIfEsp, tun4_decrypt_node_name = "esp4-decrypt-tun" +@tag_fixme_vpp_workers class TestIpsec4MultiTunIfEsp(TemplateIpsec4TunProtect, TemplateIpsec, IpsecTun4): @@ -750,6 +752,7 @@ class TestIpsec4TunIfEspNoAlgo(TemplateIpsec4TunProtect, self.unconfig_network(p) +@tag_fixme_vpp_workers class TestIpsec6MultiTunIfEsp(TemplateIpsec6TunProtect, TemplateIpsec, IpsecTun6): @@ -1839,6 +1842,7 @@ class TestIpsecMGreIfEspTra6(TemplateIpsec, IpsecTun6): self.verify_tun_66(p, count=63) +@tag_fixme_vpp_workers class TestIpsec4TunProtect(TemplateIpsec, TemplateIpsec4TunProtect, IpsecTun4): @@ -1900,6 +1904,7 @@ class TestIpsec4TunProtect(TemplateIpsec, self.unconfig_network(p) +@tag_fixme_vpp_workers class TestIpsec4TunProtectUdp(TemplateIpsec, TemplateIpsec4TunProtect, IpsecTun4): @@ -1948,6 +1953,7 @@ class TestIpsec4TunProtectUdp(TemplateIpsec, self.verify_keepalive(self.ipv4_params) +@tag_fixme_vpp_workers class TestIpsec4TunProtectTun(TemplateIpsec, TemplateIpsec4TunProtect, IpsecTun4): @@ -2110,6 +2116,7 @@ class TestIpsec4TunProtectTunDrop(TemplateIpsec, self.unconfig_network(p) +@tag_fixme_vpp_workers class TestIpsec6TunProtect(TemplateIpsec, TemplateIpsec6TunProtect, IpsecTun6): @@ -2236,6 +2243,7 @@ class TestIpsec6TunProtect(TemplateIpsec, self.unconfig_network(p) +@tag_fixme_vpp_workers class TestIpsec6TunProtectTun(TemplateIpsec, TemplateIpsec6TunProtect, IpsecTun6): @@ -2452,6 +2460,7 @@ class TemplateIpsecItf4(object): p.tun_sa_in.remove_vpp_config() +@tag_fixme_vpp_workers class TestIpsecItf4(TemplateIpsec, TemplateIpsecItf4, IpsecTun4): @@ -2720,6 +2729,7 @@ class TemplateIpsecItf6(object): p.tun_sa_in.remove_vpp_config() +@tag_fixme_vpp_workers class TestIpsecItf6(TemplateIpsec, TemplateIpsecItf6, IpsecTun6): diff --git a/test/test_mpls.py b/test/test_mpls.py index 0f3c617fcc7..f0c3b0f3b95 100644 --- a/test/test_mpls.py +++ b/test/test_mpls.py @@ -3,6 +3,7 @@ import unittest import socket +from framework import tag_fixme_vpp_workers from framework import VppTestCase, VppTestRunner from vpp_ip import DpoProto, INVALID_INDEX from vpp_ip_route import VppIpRoute, VppRoutePath, VppMplsRoute, \ @@ -59,6 +60,7 @@ def verify_mpls_stack(tst, rx, mpls_labels): rx_mpls = rx_mpls[MPLS].payload +@tag_fixme_vpp_workers class TestMPLS(VppTestCase): """ MPLS Test Case """ diff --git a/test/test_neighbor.py b/test/test_neighbor.py index f69a2634686..c34ac1aea4e 100644 --- a/test/test_neighbor.py +++ b/test/test_neighbor.py @@ -4,6 +4,7 @@ import unittest import os from socket import AF_INET, AF_INET6, inet_pton +from framework import tag_fixme_vpp_workers from framework import VppTestCase, VppTestRunner from vpp_neighbor import VppNeighbor, find_nbr from vpp_ip_route import VppIpRoute, VppRoutePath, find_route, \ @@ -1815,6 +1816,7 @@ class ARPTestCase(VppTestCase): conn2.remove_vpp_config() +@tag_fixme_vpp_workers class NeighborStatsTestCase(VppTestCase): """ ARP/ND Counters """ diff --git a/test/test_punt.py b/test/test_punt.py index d3a9307c367..c6d6dbc5140 100644 --- a/test/test_punt.py +++ b/test/test_punt.py @@ -26,6 +26,7 @@ from scapy.layers.ipsec import ESP import scapy.layers.inet6 as inet6 from scapy.layers.inet6 import IPv6, ICMPv6DestUnreach from scapy.contrib.ospf import OSPF_Hdr, OSPFv3_Hello +from framework import tag_fixme_vpp_workers from framework import VppTestCase, VppTestRunner from vpp_ip import DpoProto @@ -1046,6 +1047,7 @@ class TestIpProtoPuntSocket(TestPuntSocket): self.vapi.punt_socket_deregister(punt_ospf) +@tag_fixme_vpp_workers class TestPunt(VppTestCase): """ Exception Punt Test Case """ diff --git a/test/test_session.py b/test/test_session.py index 6854cb8a8bd..8e03968d19a 100644 --- a/test/test_session.py +++ b/test/test_session.py @@ -2,11 +2,13 @@ import unittest +from framework import tag_fixme_vpp_workers from framework import VppTestCase, VppTestRunner from framework import tag_run_solo from vpp_ip_route import VppIpTable, VppIpRoute, VppRoutePath +@tag_fixme_vpp_workers class TestSession(VppTestCase): """ Session Test Case """ @@ -90,6 +92,7 @@ class TestSession(VppTestCase): ip_t10.remove_vpp_config() +@tag_fixme_vpp_workers class TestSessionUnitTests(VppTestCase): """ Session Unit Tests Case """ diff --git a/test/test_stats_client.py b/test/test_stats_client.py index ced58710e35..300e8208a87 100644 --- a/test/test_stats_client.py +++ b/test/test_stats_client.py @@ -4,9 +4,11 @@ import unittest import psutil from vpp_papi.vpp_stats import VPPStats +from framework import tag_fixme_vpp_workers from framework import VppTestCase, VppTestRunner +@tag_fixme_vpp_workers class StatsClientTestCase(VppTestCase): """Test Stats Client""" diff --git a/test/test_tcp.py b/test/test_tcp.py index f8e51057d38..4ceb46e666c 100644 --- a/test/test_tcp.py +++ b/test/test_tcp.py @@ -2,10 +2,12 @@ import unittest +from framework import tag_fixme_vpp_workers from framework import VppTestCase, VppTestRunner from vpp_ip_route import VppIpTable, VppIpRoute, VppRoutePath +@tag_fixme_vpp_workers class TestTCP(VppTestCase): """ TCP Test Case """ diff --git a/test/test_udp.py b/test/test_udp.py index a0b2167d701..03a0812a342 100644 --- a/test/test_udp.py +++ b/test/test_udp.py @@ -1,5 +1,6 @@ #!/usr/bin/env python3 import unittest +from framework import tag_fixme_vpp_workers from framework import VppTestCase, VppTestRunner from vpp_udp_encap import find_udp_encap, VppUdpEncap @@ -15,6 +16,7 @@ from scapy.contrib.mpls import MPLS NUM_PKTS = 67 +@tag_fixme_vpp_workers class TestUdpEncap(VppTestCase): """ UDP Encap Test Case """ @@ -247,6 +249,7 @@ class TestUdpEncap(VppTestCase): self.assertEqual(udp_encap_1.get_stats()['packets'], 2*NUM_PKTS) +@tag_fixme_vpp_workers class TestUDP(VppTestCase): """ UDP Test Case """ -- cgit 1.2.3-korg