diff options
| author |   vitikkan <viktor.tikkanen@nokia.com> | 2016-08-03 11:37:55 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-08-03 11:37:55 +0000 |
| commit | 5f0d2316d91b40a6cf62b15b309b0c2e2d2f582c (patch) | |
| tree | 0dd8bc64666340e291dc7d9d6a807166803a7068 /testcases/OpenStack/tempest/run_tempest.py | |
| parent | 9f7f322f30921ecdc4c2f7e4b2e7a147ed9a6712 (diff) | |
| parent | 15817ab1cea380c9d5e043d4ac9063f95391fed2 (diff) | |
Merge "Shorter test case names are accepted for tempest blacklist file"
Diffstat (limited to 'testcases/OpenStack/tempest/run_tempest.py')
| -rwxr-xr-x | testcases/OpenStack/tempest/run_tempest.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/testcases/OpenStack/tempest/run_tempest.py b/testcases/OpenStack/tempest/run_tempest.py index 1dd908de4..53a70b799 100755 --- a/testcases/OpenStack/tempest/run_tempest.py +++ b/testcases/OpenStack/tempest/run_tempest.py @@ -308,9 +308,12 @@ def apply_tempest_blacklist(): black_tests = [] logger.debug("Tempest blacklist file does not exist.") - for line in cases_file: - if line not in black_tests: - result_file.write(str(line) + '\n') + for cases_line in cases_file: + for black_tests_line in black_tests: + if black_tests_line in cases_line: + break + else: + result_file.write(str(cases_line) + '\n') result_file.close() |