diff options
| author |   Juha Kosonen <juha.kosonen@nokia.com> | 2018-08-28 15:32:22 +0300 |
|---|---|---|
| committer | Juha Kosonen <juha.kosonen@nokia.com> | 2018-08-28 12:40:17 +0000 |
| commit | 9b2388768fb6531ea31cdc87806f95249b08af68 (patch) | |
| tree | 5d1c1eba2319020b0c69d19251d9443376873744 /functest/opnfv_tests/openstack/tempest/tempest.py | |
| parent | 3b5a537a6ababd5d6a7157157ae4108ed21075c4 (diff) | |
Remove installer type from tempest blacklist
Enables utilization of blacklist also on non-OPNFV environments since
there is no link to installer type.
JIRA: FUNCTEST-1008
Change-Id: I3a012b8b7e7dbd049f8794dff3c9d56dcc1cadad
Signed-off-by: Juha Kosonen <juha.kosonen@nokia.com>
Diffstat (limited to 'functest/opnfv_tests/openstack/tempest/tempest.py')
| -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) |