Tests: Cleanup @skip decorator.

[vpp.git] / test / run_tests.py

diff --git a/test/run_tests.py b/test/run_tests.py
index cbca7f9..2940f9e 100644 (file)
--- a/test/run_tests.py
+++ b/test/run_tests.py
@@ -87,33 +87,37 @@ class TestResult(dict):
             return suite_from_failed(self.testcase_suite, rerun_ids)
 
     def get_testcase_names(self, test_id):
-        if re.match(r'.+\..+\..+', test_id):
+        # could be tearDownClass (test_ipsec_esp.TestIpsecEsp1)
+        setup_teardown_match = re.match(
+            r'((tearDownClass)|(setUpClass)) \((.+\..+)\)', test_id)
+        if setup_teardown_match:
+            test_name, _, _, testcase_name = setup_teardown_match.groups()
+            if len(testcase_name.split('.')) == 2:
+                for key in self.testcases_by_id.keys():
+                    if key.startswith(testcase_name):
+                        testcase_name = key
+                        break
+            testcase_name = self._get_testcase_doc_name(testcase_name)
+        else:
             test_name = self._get_test_description(test_id)
             testcase_name = self._get_testcase_doc_name(test_id)
-        else:
-            # could be tearDownClass (test_ipsec_esp.TestIpsecEsp1)
-            setup_teardown_match = re.match(
-                r'((tearDownClass)|(setUpClass)) \((.+\..+)\)', test_id)
-            if setup_teardown_match:
-                test_name, _, _, testcase_name = setup_teardown_match.groups()
-                if len(testcase_name.split('.')) == 2:
-                    for key in self.testcases_by_id.keys():
-                        if key.startswith(testcase_name):
-                            testcase_name = key
-                            break
-                testcase_name = self._get_testcase_doc_name(testcase_name)
-            else:
-                test_name = test_id
-                testcase_name = test_id
 
         return testcase_name, test_name
 
     def _get_test_description(self, test_id):
-        return get_test_description(descriptions,
-                                    self.testcases_by_id[test_id])
+        if test_id in self.testcases_by_id:
+            desc = get_test_description(descriptions,
+                                        self.testcases_by_id[test_id])
+        else:
+            desc = test_id
+        return desc
 
     def _get_testcase_doc_name(self, test_id):
-        return get_testcase_doc_name(self.testcases_by_id[test_id])
+        if test_id in self.testcases_by_id:
+            doc_name = get_testcase_doc_name(self.testcases_by_id[test_id])
+        else:
+            doc_name = test_id
+        return doc_name
 
 
 def test_runner_wrapper(suite, keep_alive_pipe, stdouterr_queue,
@@ -139,7 +143,11 @@ class TestCaseWrapper(object):
         self.finished_parent_end, self.finished_child_end = Pipe(duplex=False)
         self.result_parent_end, self.result_child_end = Pipe(duplex=False)
         self.testcase_suite = testcase_suite
-        self.stdouterr_queue = manager.StreamQueue()
+        if sys.version[0] == '2':
+            self.stdouterr_queue = manager.StreamQueue()
+        else:
+            from multiprocessing import get_context
+            self.stdouterr_queue = manager.StreamQueue(ctx=get_context())
         self.logger = get_parallel_logger(self.stdouterr_queue)
         self.child = Process(target=test_runner_wrapper,
                              args=(testcase_suite,
@@ -774,7 +782,7 @@ if __name__ == '__main__':
     print("%s out of %s tests match specified filters" % (
         tests_amount, tests_amount + cb.filtered.countTestCases()))
 
-    if not running_extended_tests():
+    if not running_extended_tests:
         print("Not running extended tests (some tests will be skipped)")
 
     attempts = retries + 1