Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
MFIB; CLI improvements
[vpp.git]
/
test
/
run_tests.py
diff --git
a/test/run_tests.py
b/test/run_tests.py
index
d72a74c
..
310cdcf
100644
(file)
--- a/
test/run_tests.py
+++ b/
test/run_tests.py
@@
-68,8
+68,8
@@
class TestResult(dict):
def was_successful(self):
return 0 == len(self[FAIL]) == len(self[ERROR]) \
def was_successful(self):
return 0 == len(self[FAIL]) == len(self[ERROR]) \
-
and len(self[PASS] + self[SKIP]) \
-
== self.testcase_suite.countTestCases() == len(self[TEST_RUN])
+ and len(self[PASS] + self[SKIP]) \
+ == self.testcase_suite.countTestCases() == len(self[TEST_RUN])
def no_tests_run(self):
return 0 == len(self[TEST_RUN])
def no_tests_run(self):
return 0 == len(self[TEST_RUN])
@@
-232,7
+232,7
@@
def handle_failed_suite(logger, last_test_temp_dir, vpp_pid):
if last_test_temp_dir:
# Need to create link in case of a timeout or core dump without failure
lttd = os.path.basename(last_test_temp_dir)
if last_test_temp_dir:
# Need to create link in case of a timeout or core dump without failure
lttd = os.path.basename(last_test_temp_dir)
- failed_dir = os.getenv('
VPP_TEST_
FAILED_DIR')
+ failed_dir = os.getenv('FAILED_DIR')
link_path = '%s%s-FAILED' % (failed_dir, lttd)
if not os.path.exists(link_path):
os.symlink(last_test_temp_dir, link_path)
link_path = '%s%s-FAILED' % (failed_dir, lttd)
if not os.path.exists(link_path):
os.symlink(last_test_temp_dir, link_path)
@@
-612,8
+612,8
@@
class AllResults(dict):
print(' Testcase name: {}'.format(
colorize(new_testcase_name, RED)))
old_testcase_name = new_testcase_name
print(' Testcase name: {}'.format(
colorize(new_testcase_name, RED)))
old_testcase_name = new_testcase_name
- print(' FAILURE: {}'.format(
- colorize(test_name, RED)))
+ print(' FAILURE: {}
[{}]
'.format(
+ colorize(test_name, RED)
, failed_test_id
))
for failed_test_id in errored_testcase_ids:
new_testcase_name, test_name = \
result.get_testcase_names(failed_test_id)
for failed_test_id in errored_testcase_ids:
new_testcase_name, test_name = \
result.get_testcase_names(failed_test_id)
@@
-621,8
+621,8
@@
class AllResults(dict):
print(' Testcase name: {}'.format(
colorize(new_testcase_name, RED)))
old_testcase_name = new_testcase_name
print(' Testcase name: {}'.format(
colorize(new_testcase_name, RED)))
old_testcase_name = new_testcase_name
- print(' ERROR: {}'.format(
- colorize(test_name, RED)))
+ print(' ERROR: {}
[{}]
'.format(
+ colorize(test_name, RED)
, failed_test_id
))
if len(self.testsuites_no_tests_run) > 0:
print('TESTCASES WHERE NO TESTS WERE SUCCESSFULLY EXECUTED:')
tc_classes = set()
if len(self.testsuites_no_tests_run) > 0:
print('TESTCASES WHERE NO TESTS WERE SUCCESSFULLY EXECUTED:')
tc_classes = set()
@@
-750,10
+750,11
@@
if __name__ == '__main__':
filter_cb = FilterByTestOption(filter_file, filter_class, filter_func)
filter_cb = FilterByTestOption(filter_file, filter_class, filter_func)
+ ignore_path = os.getenv("VENV_PATH", None)
cb = SplitToSuitesCallback(filter_cb)
for d in args.dir:
print("Adding tests from directory tree %s" % d)
cb = SplitToSuitesCallback(filter_cb)
for d in args.dir:
print("Adding tests from directory tree %s" % d)
- discover_tests(d, cb)
+ discover_tests(d, cb
, ignore_path
)
# suites are not hashable, need to use list
suites = []
# suites are not hashable, need to use list
suites = []