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/tests/unit | |
| parent | f10ff0861887807da7e6eee663efc0031e28827c (diff) | |
| parent | 9b2388768fb6531ea31cdc87806f95249b08af68 (diff) | |
Merge "Remove installer type from tempest blacklist"
Diffstat (limited to 'functest/tests/unit')
| -rw-r--r-- | functest/tests/unit/openstack/tempest/test_tempest.py | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/functest/tests/unit/openstack/tempest/test_tempest.py b/functest/tests/unit/openstack/tempest/test_tempest.py index 23dcd6c75..a542bbb25 100644 --- a/functest/tests/unit/openstack/tempest/test_tempest.py +++ b/functest/tests/unit/openstack/tempest/test_tempest.py @@ -116,7 +116,6 @@ class OSTempestTesting(unittest.TestCase): mock.patch.object(self.tempestcommon, 'read_file', return_value=['test1', 'test2']): conf_utils.TEMPEST_BLACKLIST = Exception - os.environ['INSTALLER_TYPE'] = 'installer_type' os.environ['DEPLOY_SCENARIO'] = 'deploy_scenario' self.tempestcommon.apply_tempest_blacklist() obj = mock_open() @@ -132,7 +131,6 @@ class OSTempestTesting(unittest.TestCase): @mock.patch("os.path.exists", return_value=True) def test_apply_blacklist_default(self, *args): item_dict = {'scenarios': ['deploy_scenario'], - 'installers': ['installer_type'], 'tests': ['test2']} with mock.patch('six.moves.builtins.open', mock.mock_open()) as mock_open, \ @@ -140,7 +138,6 @@ class OSTempestTesting(unittest.TestCase): return_value=['test1', 'test2']), \ mock.patch('functest.opnfv_tests.openstack.tempest.tempest.' 'yaml.safe_load', return_value=item_dict): - os.environ['INSTALLER_TYPE'] = 'installer_type' os.environ['DEPLOY_SCENARIO'] = 'deploy_scenario' self.tempestcommon.apply_tempest_blacklist() obj = mock_open() |