diff options
| author |   Cedric Ollivier <cedric.ollivier@orange.com> | 2019-08-27 14:42:10 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2019-08-27 14:42:10 +0000 |
| commit | 69febafcc9eec68889990c271993817b4214a968 (patch) | |
| tree | 638f232f22dedd41259ee9e93d0d166f966baba3 | |
| parent | 319c996767a62fa2bc88e1f30bcfe5a8312195ff (diff) | |
| parent | 41692fe4d67e714a69813287bdb28e07f01d5700 (diff) | |
Merge "Support regex in tempest blacklist" into stable/iruya
| -rw-r--r-- | functest/opnfv_tests/openstack/tempest/tempest.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py index be86cee86..9c84cdc82 100644 --- a/functest/opnfv_tests/openstack/tempest/tempest.py +++ b/functest/opnfv_tests/openstack/tempest/tempest.py @@ -368,18 +368,17 @@ class TempestCommon(singlevm.VmReady2): black_list_file.close() for item in black_list_yaml: scenarios = item['scenarios'] - if deploy_scenario in scenarios: + in_it = rally.RallyBase.in_iterable_re + if in_it(deploy_scenario, scenarios): tests = item['tests'] - for test in tests: - black_tests.append(test) - break + black_tests.extend(tests) except Exception: # pylint: disable=broad-except black_tests = [] LOGGER.debug("Tempest blacklist file does not exist.") for cases_line in cases_file: for black_tests_line in black_tests: - if black_tests_line in cases_line: + if re.search(black_tests_line, cases_line): break else: result_file.write(str(cases_line) + '\n') |