commit c8eae8d28aa6c9fb946a8be5b1731e0e79d7cdff
author Andrew Yourtchenko <ayourtch@gmail.com> Wed Jan 20 20:30:36 2021 +0000
committer Andrew Yourtchenko <ayourtch@gmail.com> Mon Feb 08 15:32:04 2021 +0000
tree f181c1f79a2d4c7970761af120285937596d293f
parent 7f23ecd151be06ac6f234224628ea305c5e0b41c

tests: allow for externally supplied VPP workers config for tests

Allow to supply the external VPP worker config for tests which
do not specify the workers config explicitly, and use
the tags infra to flag those that need attention in this configuration.
This commit shows one example use of such a tag, there will be
a separate commit with the rest of the places needing it,
since that change is rather mechanical.

Thus, the assumption is that the test should by default be agnostic
of the VPP configuration, unless it explicitly specifies so.

Type: test
Change-Id: I3c0077e4e22a75cb9561fb98d3b783b93486b2be
Signed-off-by: Andrew Yourtchenko <ayourtch@gmail.com>

src/plugins/acl/test/test_acl_plugin.py

diff --git a/src/plugins/acl/test/test_acl_plugin.py b/src/plugins/acl/test/test_acl_plugin.py
index d5e195f..53d9621 100644
--- a/src/plugins/acl/test/test_acl_plugin.py
+++ b/src/plugins/acl/test/test_acl_plugin.py
@@ -11,6 +11,7 @@
 from scapy.layers.inet6 import IPv6, ICMPv6EchoRequest
 from scapy.layers.inet6 import IPv6ExtHdrFragment
 from framework import VppTestCase, VppTestRunner
+from framework import tag_fixme_vpp_workers
 from util import Host, ppp
 from ipaddress import IPv4Network, IPv6Network
 
@@ -19,6 +20,7 @@
 from vpp_ip import INVALID_INDEX
 
 
+@tag_fixme_vpp_workers
 class TestACLplugin(VppTestCase):
     """ ACL plugin Test Case """
 

test/framework.py

diff --git a/test/framework.py b/test/framework.py
index 7ab5b45..c9ecafd 100644
--- a/test/framework.py
+++ b/test/framework.py
@@ -257,7 +257,11 @@
 
 
 class TestCaseTag(Enum):
+    # marks the suites that must run at the end
+    # using only a single test runner
     RUN_SOLO = 1
+    # marks the suites broken on VPP multi-worker
+    FIXME_VPP_WORKERS = 2
 
 
 def create_tag_decorator(e):
@@ -269,7 +273,9 @@
         return cls
     return decorator
 
+
 tag_run_solo = create_tag_decorator(TestCaseTag.RUN_SOLO)
+tag_fixme_vpp_workers = create_tag_decorator(TestCaseTag.FIXME_VPP_WORKERS)
 
 
 class VppTestCase(unittest.TestCase):
@@ -398,7 +404,10 @@
 
         cpu_core_number = cls.get_least_used_cpu()
         if not hasattr(cls, "worker_config"):
-            cls.worker_config = ""
+            cls.worker_config = os.getenv("VPP_WORKER_CONFIG", "")
+            if cls.worker_config != "":
+                if cls.has_tag(TestCaseTag.FIXME_VPP_WORKERS):
+                    cls.worker_config = ""
 
         default_variant = os.getenv("VARIANT")
         if default_variant is not None:
@@ -1435,6 +1444,13 @@
                 c = YELLOW
                 test_title_colored = colorize("SOLO RUN: " + test_title, c)
 
+            # This block may overwrite the colorized title above,
+            # but we want this to stand out and be fixed
+            if test.has_tag(TestCaseTag.FIXME_VPP_WORKERS):
+                c = RED
+                w = "FIXME with VPP workers: "
+                test_title_colored = colorize(w + test_title, c)
+
             if not hasattr(test.__class__, '_header_printed'):
                 print(double_line_delim)
                 print(test_title_colored)

test/test_util.py

diff --git a/test/test_util.py b/test/test_util.py
index eb20531..421afce 100755
--- a/test/test_util.py
+++ b/test/test_util.py
@@ -14,6 +14,15 @@
         """ if the test case class is timing-sensitive - return true """
         return False
 
+    @classmethod
+    def has_tag(cls, tag):
+        """ if the test case has a given tag - return true """
+        try:
+            return tag in cls.test_tags
+        except AttributeError:
+            pass
+        return False
+
     def test_mac_to_binary(self):
         """ MAC to binary and back """
         mac = 'aa:bb:cc:dd:ee:ff'