diff options
author | Cedric Ollivier <cedric.ollivier@orange.com> | 2018-08-28 15:47:30 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2018-08-28 15:47:30 +0000 |
commit | 7cf1bbdca2709910e32d435e9f1bef9c4c43b6d1 (patch) | |
tree | 421d1254938e087b3e045275d8d4c2f4e176db2b /functest/opnfv_tests/openstack/tempest | |
parent | f10ff0861887807da7e6eee663efc0031e28827c (diff) | |
parent | 9b2388768fb6531ea31cdc87806f95249b08af68 (diff) |
Merge "Remove installer type from tempest blacklist"
Diffstat (limited to 'functest/opnfv_tests/openstack/tempest')
-rw-r--r-- | functest/opnfv_tests/openstack/tempest/tempest.py | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py index 4f8002e26..542ed9ed0 100644 --- a/functest/opnfv_tests/openstack/tempest/tempest.py +++ b/functest/opnfv_tests/openstack/tempest/tempest.py @@ -167,19 +167,15 @@ class TempestCommon(singlevm.VmReady1): result_file = open(self.list, 'w') black_tests = [] try: - installer_type = env.get('INSTALLER_TYPE') deploy_scenario = env.get('DEPLOY_SCENARIO') - if bool(installer_type) * bool(deploy_scenario): - # if INSTALLER_TYPE and DEPLOY_SCENARIO are set we read the - # file + if bool(deploy_scenario): + # if DEPLOY_SCENARIO is set we read the file black_list_file = open(conf_utils.TEMPEST_BLACKLIST) black_list_yaml = yaml.safe_load(black_list_file) black_list_file.close() for item in black_list_yaml: scenarios = item['scenarios'] - installers = item['installers'] - if (deploy_scenario in scenarios and - installer_type in installers): + if deploy_scenario in scenarios: tests = item['tests'] for test in tests: black_tests.append(test) |