summaryrefslogtreecommitdiffstats
path: root/test/framework.py
diff options
context:
space:
mode:
authorPaul Vinciguerra <pvinci@vinciconsulting.com>2018-11-21 09:54:50 -0800
committerOle Trøan <otroan@employees.org>2018-11-22 06:59:19 +0000
commitc32023b9fd6970ed1cac1b3c7f36233b536d9968 (patch)
tree969810d8f77faa9ab7be3fc6e6fb8bf25b343ba2 /test/framework.py
parent5642109506e304c9817434b6f82616dcad83698f (diff)
Fix instance method call in test/framework.py
Instance method breaking encapsulation by calling a global fn. Change-Id: Ifde2a207951143764aed75f1b191aed0bac83704 Signed-off-by: Paul Vinciguerra <pvinci@vinciconsulting.com>
Diffstat (limited to 'test/framework.py')
-rw-r--r--test/framework.py15
1 files changed, 6 insertions, 9 deletions
diff --git a/test/framework.py b/test/framework.py
index 4c536e062b0..019f366dabe 100644
--- a/test/framework.py
+++ b/test/framework.py
@@ -983,14 +983,6 @@ def get_testcase_doc_name(test):
return getdoc(test.__class__).splitlines()[0]
-def get_test_description(descriptions, test):
- short_description = test.shortDescription()
- if descriptions and short_description:
- return short_description
- else:
- return str(test)
-
-
class TestCaseInfo(object):
def __init__(self, logger, tempdir, vpp_pid, vpp_bin_path):
self.logger = logger
@@ -1175,7 +1167,12 @@ class VppTestResult(unittest.TestResult):
:returns: test description
"""
- return get_test_description(self.descriptions, test)
+ # TODO: if none print warning not raise exception
+ short_description = test.shortDescription()
+ if self.descriptions and short_description:
+ return short_description
+ else:
+ return str(test)
def startTest(self, test):
"""