ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tests: allow for externally supplied VPP workers config for tests

Browse Source 
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>
This commit is contained in:
Andrew Yourtchenko
2021-01-20 20:30:36 +00:00
parent 7f23ecd151
commit c8eae8d28a
3 changed files with 28 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
test/framework.py
View File

@ -257,7 +257,11 @@ class KeepAliveReporter(object):
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 @@ def create_tag_decorator(e):
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 @@ class VppTestCase(unittest.TestCase):
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 @@ class VppTestResult(unittest.TestResult):
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)