diff options
Diffstat (limited to 'functest/tests')
| -rw-r--r-- | functest/tests/unit/openstack/rally/test_rally.py | 6 | ||||
| -rw-r--r-- | functest/tests/unit/openstack/tempest/test_tempest.py | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/functest/tests/unit/openstack/rally/test_rally.py b/functest/tests/unit/openstack/rally/test_rally.py index 13b63cd86..226d4e69a 100644 --- a/functest/tests/unit/openstack/rally/test_rally.py +++ b/functest/tests/unit/openstack/rally/test_rally.py @@ -96,7 +96,7 @@ class OSRallyTesting(unittest.TestCase): mock_path_exists.side_effect = self.check_temp_dir yaml_file = 'opnfv-{}.yaml'.format('test_file_name') - ret_val = os.path.join(self.rally_base.TEMP_DIR, yaml_file) + ret_val = os.path.join(self.rally_base.temp_dir, yaml_file) self.assertEqual(self.rally_base._prepare_test_list('test_file_name'), ret_val) mock_path_exists.assert_called() @@ -280,7 +280,7 @@ class OSRallyTesting(unittest.TestCase): mock_summary.assert_called() def test_prepare_run_testname_invalid(self): - self.rally_base.TESTS = ['test1', 'test2'] + self.rally_base.stests = ['test1', 'test2'] with self.assertRaises(Exception): self.rally_base.prepare_run(tests=['test']) @@ -290,7 +290,7 @@ class OSRallyTesting(unittest.TestCase): @mock.patch('functest.opnfv_tests.openstack.rally.rally.shutil.rmtree') def test_prepare_run_flavor_alt_creation_failed(self, *args): # pylint: disable=unused-argument - self.rally_base.TESTS = ['test1', 'test2'] + self.rally_base.stests = ['test1', 'test2'] with mock.patch.object(self.rally_base.cloud, 'list_hypervisors') as mock_list_hyperv, \ mock.patch.object(self.rally_base, 'create_flavor_alt', diff --git a/functest/tests/unit/openstack/tempest/test_tempest.py b/functest/tests/unit/openstack/tempest/test_tempest.py index a500a37e1..87438ae7c 100644 --- a/functest/tests/unit/openstack/tempest/test_tempest.py +++ b/functest/tests/unit/openstack/tempest/test_tempest.py @@ -57,7 +57,7 @@ class OSTempestTesting(unittest.TestCase): msg = "Tempest test list file %s NOT found." self.tempestcommon.generate_test_list() self.assertTrue( - (msg % self.tempestcommon.TEMPEST_CUSTOM) in context.exception) + (msg % self.tempestcommon.tempest_custom) in context.exception) @mock.patch('subprocess.check_output') @mock.patch('os.remove') @@ -123,7 +123,7 @@ class OSTempestTesting(unittest.TestCase): mock.mock_open()) as mock_open, \ mock.patch.object(self.tempestcommon, 'read_file', return_value=['test1', 'test2']): - self.tempestcommon.TEMPEST_BLACKLIST = Exception + self.tempestcommon.tempest_blacklist = Exception os.environ['DEPLOY_SCENARIO'] = 'deploy_scenario' self.tempestcommon.apply_tempest_blacklist() obj = mock_open() @@ -163,9 +163,9 @@ class OSTempestTesting(unittest.TestCase): return_value=[r'\} tempest\.']), \ mock.patch('functest.opnfv_tests.openstack.tempest.tempest.' 'subprocess.Popen'): - self.tempestcommon.TEMPEST_LIST = 'test_tempest_list' + self.tempestcommon.tempest_list = 'test_tempest_list' cmd = ["rally", "verify", "start", "--load-list", - self.tempestcommon.TEMPEST_LIST] + self.tempestcommon.tempest_list] with self.assertRaises(Exception): self.tempestcommon.run_verifier_tests() mock_logger_info. \ |