aboutsummaryrefslogtreecommitdiffstats
path: root/functest/tests/unit/opnfv_tests
diff options
context:
space:
mode:
Diffstat (limited to 'functest/tests/unit/opnfv_tests')
-rw-r--r--functest/tests/unit/opnfv_tests/openstack/rally/test_rally.py6
-rw-r--r--functest/tests/unit/opnfv_tests/openstack/refstack_client/test_refstack_client.py4
-rw-r--r--functest/tests/unit/opnfv_tests/openstack/tempest/test_tempest.py20
3 files changed, 15 insertions, 15 deletions
diff --git a/functest/tests/unit/opnfv_tests/openstack/rally/test_rally.py b/functest/tests/unit/opnfv_tests/openstack/rally/test_rally.py
index 99e14b85e..fe25dfcf9 100644
--- a/functest/tests/unit/opnfv_tests/openstack/rally/test_rally.py
+++ b/functest/tests/unit/opnfv_tests/openstack/rally/test_rally.py
@@ -12,7 +12,7 @@ import unittest
import mock
-from functest.core import testcase_base
+from functest.core import testcase
from functest.opnfv_tests.openstack.rally import rally
from functest.utils.constants import CONST
@@ -378,13 +378,13 @@ class OSRallyTesting(unittest.TestCase):
mock.patch.object(self.rally_base, '_generate_report'), \
mock.patch.object(self.rally_base, '_clean_up'):
self.assertEqual(self.rally_base.run(),
- testcase_base.TestCase.EX_OK)
+ testcase.TestCase.EX_OK)
def test_run_exception(self):
with mock.patch.object(self.rally_base, '_prepare_env',
side_effect=Exception):
self.assertEqual(self.rally_base.run(),
- testcase_base.TestCase.EX_RUN_ERROR)
+ testcase.TestCase.EX_RUN_ERROR)
if __name__ == "__main__":
diff --git a/functest/tests/unit/opnfv_tests/openstack/refstack_client/test_refstack_client.py b/functest/tests/unit/opnfv_tests/openstack/refstack_client/test_refstack_client.py
index 4035b9c30..60e180c9e 100644
--- a/functest/tests/unit/opnfv_tests/openstack/refstack_client/test_refstack_client.py
+++ b/functest/tests/unit/opnfv_tests/openstack/refstack_client/test_refstack_client.py
@@ -10,7 +10,7 @@ import mock
import os
import unittest
-from functest.core import testcase_base
+from functest.core import testcase
from functest.opnfv_tests.openstack.refstack_client import refstack_client
from functest.utils.constants import CONST
@@ -70,7 +70,7 @@ class OSRefstackClientTesting(unittest.TestCase):
def _test_main_missing_keyword(self, key):
kwargs = self._get_main_kwargs(key)
self.assertEqual(self.refstackclient.main(**kwargs),
- testcase_base.TestCase.EX_RUN_ERROR)
+ testcase.TestCase.EX_RUN_ERROR)
def test_main_missing_conf(self):
self._test_main_missing_keyword('config')
diff --git a/functest/tests/unit/opnfv_tests/openstack/tempest/test_tempest.py b/functest/tests/unit/opnfv_tests/openstack/tempest/test_tempest.py
index 56864b534..398c53bf3 100644
--- a/functest/tests/unit/opnfv_tests/openstack/tempest/test_tempest.py
+++ b/functest/tests/unit/opnfv_tests/openstack/tempest/test_tempest.py
@@ -10,7 +10,7 @@ import unittest
import mock
-from functest.core import testcase_base
+from functest.core import testcase
from functest.opnfv_tests.openstack.tempest import tempest
from functest.opnfv_tests.openstack.tempest import conf_utils
@@ -119,7 +119,7 @@ class OSTempestTesting(unittest.TestCase):
mock_method.assert_any_call('test_case_name', 100)
def test_run_missing_create_tempest_dir(self):
- ret = testcase_base.TestCase.EX_RUN_ERROR
+ ret = testcase.TestCase.EX_RUN_ERROR
with mock.patch('functest.opnfv_tests.openstack.tempest.tempest.'
'os.path.exists', return_value=False), \
mock.patch('functest.opnfv_tests.openstack.tempest.tempest.'
@@ -132,8 +132,8 @@ class OSTempestTesting(unittest.TestCase):
self.assertTrue(mock_os_makedirs.called)
def test_run_missing_configure_tempest(self):
- ret = testcase_base.TestCase.EX_RUN_ERROR
- ret_ok = testcase_base.TestCase.EX_OK
+ ret = testcase.TestCase.EX_RUN_ERROR
+ ret_ok = testcase.TestCase.EX_OK
with mock.patch('functest.opnfv_tests.openstack.tempest.tempest.'
'os.path.exists', return_value=False), \
mock.patch('functest.opnfv_tests.openstack.tempest.tempest.'
@@ -149,8 +149,8 @@ class OSTempestTesting(unittest.TestCase):
self.assertTrue(mock_os_makedirs.called)
def test_run_missing_generate_test_list(self):
- ret = testcase_base.TestCase.EX_RUN_ERROR
- ret_ok = testcase_base.TestCase.EX_OK
+ ret = testcase.TestCase.EX_RUN_ERROR
+ ret_ok = testcase.TestCase.EX_OK
with mock.patch('functest.opnfv_tests.openstack.tempest.tempest.'
'os.path.exists', return_value=False), \
mock.patch('functest.opnfv_tests.openstack.tempest.tempest.'
@@ -168,8 +168,8 @@ class OSTempestTesting(unittest.TestCase):
self.assertTrue(mock_os_makedirs.called)
def test_run_missing_apply_tempest_blacklist(self):
- ret = testcase_base.TestCase.EX_RUN_ERROR
- ret_ok = testcase_base.TestCase.EX_OK
+ ret = testcase.TestCase.EX_RUN_ERROR
+ ret_ok = testcase.TestCase.EX_OK
with mock.patch('functest.opnfv_tests.openstack.tempest.tempest.'
'os.path.exists', return_value=False), \
mock.patch('functest.opnfv_tests.openstack.tempest.tempest.'
@@ -189,8 +189,8 @@ class OSTempestTesting(unittest.TestCase):
self.assertTrue(mock_os_makedirs.called)
def test_run_missing_parse_verifier_result(self):
- ret = testcase_base.TestCase.EX_RUN_ERROR
- ret_ok = testcase_base.TestCase.EX_OK
+ ret = testcase.TestCase.EX_RUN_ERROR
+ ret_ok = testcase.TestCase.EX_OK
with mock.patch('functest.opnfv_tests.openstack.tempest.tempest.'
'os.path.exists', return_value=False), \
mock.patch('functest.opnfv_tests.openstack.tempest.tempest.'