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

Fix instance method call in test/framework.py

Browse Source 
Instance method breaking encapsulation by calling a global fn.

Change-Id: Ifde2a207951143764aed75f1b191aed0bac83704
Signed-off-by: Paul Vinciguerra <pvinci@vinciconsulting.com>
This commit is contained in:
Paul Vinciguerra
2018-11-21 09:54:50 -08:00
committed by Ole Trøan
parent 5642109506
commit c32023b9fd
2 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
test/framework.py
View File

@ -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):
"""

8
test/run_tests.py
View File

@ -15,7 +15,7 @@ from multiprocessing import Process, Pipe, cpu_count
from multiprocessing.queues import Queue
from multiprocessing.managers import BaseManager
from framework import VppTestRunner, running_extended_tests, VppTestCase, \
get_testcase_doc_name, get_test_description, PASS, FAIL, ERROR, SKIP, \
get_testcase_doc_name, PASS, FAIL, ERROR, SKIP, \
TEST_RUN
from debug import spawn_gdb
from log import get_parallel_logger, double_line_delim, RED, YELLOW, GREEN, \
@ -88,7 +88,7 @@ class TestResult(dict):
def get_testcase_names(self, test_id):
if re.match(r'.+\..+\..+', test_id):
test_name = self._get_test_description(test_id)
test_name = test_id.getDescription()
testcase_name = self._get_testcase_doc_name(test_id)
else:
# could be tearDownClass (test_ipsec_esp.TestIpsecEsp1)
@ -108,10 +108,6 @@ class TestResult(dict):
return testcase_name, test_name
def _get_test_description(self, test_id):
return get_test_description(descriptions,
self.testcases_by_id[test_id])
def _get_testcase_doc_name(self, test_id):
return get_testcase_doc_name(self.testcases_by_id[test_id])