diff options
| author |   Paul Vinciguerra <pvinci@vinciconsulting.com> | 2019-01-13 16:09:10 -0800 |
|---|---|---|
| committer |   Ole Trøan <otroan@employees.org> | 2019-01-14 13:09:08 +0000 |
| commit | dd3c5d250f3cf9712e37e47851ca07401e715f13 (patch) | |
| tree | 6fce0938d790736a1392e991bf002c451e976b4d /test/framework.py | |
| parent | 262e064bb6b8498adee8bc4793867b09398ee807 (diff) | |
VTL: Allow running simple unittest.TestCases.
It came to my attention that Ole added a simple test in:
https://gerrit.fd.io/r/#/c/16381/ and the framework forced him
to launch an instance of VPP to test the formatting of a mac address.
This change allows the test framework to run standard unittest.TestCases
without the need to spawn a VPP instance.
Change-Id: I56651ab27c4c6bf920081a526f168a743d643201
Signed-off-by: Paul Vinciguerra <pvinci@vinciconsulting.com>
Diffstat (limited to 'test/framework.py')
| -rw-r--r-- | test/framework.py | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/test/framework.py b/test/framework.py index 604e342a466..3098d39af72 100644 --- a/test/framework.py +++ b/test/framework.py @@ -273,14 +273,6 @@ class VppTestCase(unittest.TestCase): return random.choice(tuple(min_usage_set)) @classmethod - def print_header(cls): - if not hasattr(cls, '_header_printed'): - print(double_line_delim) - print(colorize(getdoc(cls).splitlines()[0], GREEN)) - print(double_line_delim) - cls._header_printed = True - - @classmethod def setUpConstants(cls): """ Set-up the test case class based on environment variables """ s = os.getenv("STEP", "n") @@ -401,7 +393,6 @@ class VppTestCase(unittest.TestCase): """ gc.collect() # run garbage collection first random.seed() - cls.print_header() cls.logger = get_logger(cls.__name__) if hasattr(cls, 'parallel_handler'): cls.logger.addHandler(cls.parallel_handler) @@ -1051,7 +1042,7 @@ class VppTestResult(unittest.TestResult): test case descriptions. :param verbosity Integer variable to store required verbosity level. """ - unittest.TestResult.__init__(self, stream, descriptions, verbosity) + super(VppTestResult, self).__init__(stream, descriptions, verbosity) self.stream = stream self.descriptions = descriptions self.verbosity = verbosity @@ -1209,7 +1200,15 @@ class VppTestResult(unittest.TestResult): :param test: """ - test.print_header() + + def print_header(test): + if not hasattr(test.__class__, '_header_printed'): + print(double_line_delim) + print(colorize(getdoc(test).splitlines()[0], GREEN)) + print(double_line_delim) + test.__class__._header_printed = True + + print_header(test) unittest.TestResult.startTest(self, test) if self.verbosity > 0: @@ -1345,3 +1344,6 @@ class Worker(Thread): self.logger.info(err) self.logger.info(single_line_delim) self.result = self.process.returncode + +if __name__ == '__main__': + pass |