From c32023b9fd6970ed1cac1b3c7f36233b536d9968 Mon Sep 17 00:00:00 2001 From: Paul Vinciguerra Date: Wed, 21 Nov 2018 09:54:50 -0800 Subject: 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 --- test/run_tests.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'test/run_tests.py') diff --git a/test/run_tests.py b/test/run_tests.py index b2de2e702fb..361990b8931 100644 --- a/test/run_tests.py +++ b/test/run_tests.py @@ -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]) -- cgit 1.2.3-korg