From 15817ab1cea380c9d5e043d4ac9063f95391fed2 Mon Sep 17 00:00:00 2001 From: vitikkan Date: Wed, 3 Aug 2016 09:19:21 +0300 Subject: Shorter test case names are accepted for tempest blacklist file Blacklist file handling is changed so that also partial test case names are accepted. For example, "tempest.api.object_storage" entry will exclude all the test cases containing this string. JIRA: FUNCTEST-401 Change-Id: I620be7dfd5d980a343d2f7cc7c0dbe40598bf65c Signed-off-by: vitikkan --- testcases/OpenStack/tempest/run_tempest.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'testcases/OpenStack/tempest/run_tempest.py') 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() -- cgit 1.2.3-korg