X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=functest%2Ftests%2Funit%2Fopenstack%2Ftempest%2Ftest_tempest.py;h=c1f245c72b4126f89f69148f842c9676db17c06c;hb=refs%2Fchanges%2F01%2F66501%2F1;hp=25737d12376cf1d34ebd340b8c18bb6d503bc2e0;hpb=9fb702111ae63824a2e293d327437d0486a565d2;p=functest.git

diff --git a/functest/tests/unit/openstack/tempest/test_tempest.py b/functest/tests/unit/openstack/tempest/test_tempest.py
index 25737d123..c1f245c72 100644
--- a/functest/tests/unit/openstack/tempest/test_tempest.py
+++ b/functest/tests/unit/openstack/tempest/test_tempest.py
@@ -16,15 +16,23 @@ from xtesting.core import testcase
 
 from functest.opnfv_tests.openstack.tempest import tempest
 from functest.opnfv_tests.openstack.tempest import conf_utils
+from functest.utils import config
 
 
 class OSTempestTesting(unittest.TestCase):
     # pylint: disable=too-many-public-methods
 
     def setUp(self):
-        with mock.patch('functest.opnfv_tests.openstack.tempest.tempest.'
-                        'conf_utils.get_verifier_id',
-                        return_value='test_deploy_id'), \
+        with mock.patch('os_client_config.get_config'), \
+                mock.patch('shade.OpenStackCloud'), \
+                mock.patch('functest.core.tenantnetwork.NewProject'), \
+                mock.patch('functest.opnfv_tests.openstack.tempest.tempest.'
+                           'conf_utils.create_rally_deployment'), \
+                mock.patch('functest.opnfv_tests.openstack.tempest.tempest.'
+                           'conf_utils.create_verifier'), \
+                mock.patch('functest.opnfv_tests.openstack.tempest.tempest.'
+                           'conf_utils.get_verifier_id',
+                           return_value='test_deploy_id'), \
                 mock.patch('functest.opnfv_tests.openstack.tempest.tempest.'
                            'conf_utils.get_verifier_deployment_id',
                            return_value='test_deploy_id'), \
@@ -36,12 +44,6 @@ class OSTempestTesting(unittest.TestCase):
                            return_value='test_verifier_deploy_dir'), \
                 mock.patch('os_client_config.make_shade'):
             self.tempestcommon = tempest.TempestCommon()
-            self.tempestsmoke_serial = tempest.TempestSmokeSerial()
-            self.tempestsmoke_parallel = tempest.TempestSmokeParallel()
-            self.tempestfull_parallel = tempest.TempestFullParallel()
-            self.tempestcustom = tempest.TempestCustom()
-            self.tempestdefcore = tempest.TempestDefcore()
-            self.tempestneutrontrunk = tempest.TempestNeutronTrunk()
 
     @mock.patch('functest.opnfv_tests.openstack.tempest.tempest.LOGGER.error')
     @mock.patch('functest.opnfv_tests.openstack.tempest.tempest.LOGGER.debug')
@@ -57,7 +59,9 @@ class OSTempestTesting(unittest.TestCase):
             self.assertTrue(
                 (msg % conf_utils.TEMPEST_CUSTOM) in context.exception)
 
-    def test_gen_tl_cm_default(self):
+    @mock.patch('subprocess.check_output')
+    @mock.patch('os.remove')
+    def test_gen_tl_cm_default(self, *args):
         self.tempestcommon.mode = 'custom'
         with mock.patch('functest.opnfv_tests.openstack.tempest.tempest.'
                         'shutil.copyfile') as mock_copyfile, \
@@ -65,21 +69,25 @@ class OSTempestTesting(unittest.TestCase):
                        'os.path.isfile', return_value=True):
             self.tempestcommon.generate_test_list()
             self.assertTrue(mock_copyfile.called)
+        args[0].assert_called_once_with('/etc/tempest.conf')
 
+    @mock.patch('os.remove')
+    @mock.patch('shutil.copyfile')
     @mock.patch('subprocess.check_output')
-    def _test_gen_tl_mode_default(self, mode, mock_exec=None):
-        self.tempestcommon.mode = mode
-        if self.tempestcommon.mode == 'smoke':
-            testr_mode = r"'^tempest\.(api|scenario).*\[.*\bsmoke\b.*\]$'"
-        elif self.tempestcommon.mode == 'full':
-            testr_mode = r"'^tempest\.'"
+    def _test_gen_tl_mode_default(self, mode, *args):
+        if mode == 'smoke':
+            testr_mode = r'^tempest\.(api|scenario).*\[.*\bsmoke\b.*\]$'
+        elif mode == 'full':
+            testr_mode = r'^tempest\.'
         else:
             testr_mode = self.tempestcommon.mode
         verifier_repo_dir = 'test_verifier_repo_dir'
-        cmd = "(cd {0}; stestr list {1} >{2} 2>/dev/null)".format(
+        self.tempestcommon.verifier_repo_dir = verifier_repo_dir
+        cmd = "(cd {0}; stestr list '{1}' >{2} 2>/dev/null)".format(
             verifier_repo_dir, testr_mode, self.tempestcommon.list)
-        self.tempestcommon.generate_test_list()
-        mock_exec.assert_called_once_with(cmd, shell=True)
+        self.tempestcommon.generate_test_list(mode=testr_mode)
+        args[0].assert_called_once_with(cmd, shell=True)
+        args[2].assert_called_once_with('/etc/tempest.conf')
 
     def test_gen_tl_smoke_mode(self):
         self._test_gen_tl_mode_default('smoke')
@@ -87,9 +95,6 @@ class OSTempestTesting(unittest.TestCase):
     def test_gen_tl_full_mode(self):
         self._test_gen_tl_mode_default('full')
 
-    def test_gen_tl_neutron_trunk_mode(self):
-        self._test_gen_tl_mode_default('neutron_trunk')
-
     def test_verif_res_missing_verif_id(self):
         self.tempestcommon.verification_id = None
         with self.assertRaises(Exception):
@@ -114,11 +119,11 @@ class OSTempestTesting(unittest.TestCase):
     @mock.patch("os.remove")
     @mock.patch("os.path.exists", return_value=True)
     def test_apply_missing_blacklist(self, *args):
-        with mock.patch('__builtin__.open', mock.mock_open()) as mock_open, \
+        with mock.patch('six.moves.builtins.open',
+                        mock.mock_open()) as mock_open, \
             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()
@@ -134,14 +139,13 @@ 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('__builtin__.open', mock.mock_open()) as mock_open, \
+        with mock.patch('six.moves.builtins.open',
+                        mock.mock_open()) as mock_open, \
             mock.patch.object(self.tempestcommon, 'read_file',
                               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()
@@ -154,8 +158,9 @@ class OSTempestTesting(unittest.TestCase):
 
     @mock.patch('functest.opnfv_tests.openstack.tempest.tempest.LOGGER.info')
     def test_run_verifier_tests_default(self, mock_logger_info):
-        with mock.patch('__builtin__.open', mock.mock_open()), \
-            mock.patch('__builtin__.iter', return_value=[r'\} tempest\.']), \
+        with mock.patch('six.moves.builtins.open', mock.mock_open()), \
+            mock.patch('six.moves.builtins.iter',
+                       return_value=[r'\} tempest\.']), \
             mock.patch('functest.opnfv_tests.openstack.tempest.tempest.'
                        'subprocess.Popen'):
             conf_utils.TEMPEST_LIST = 'test_tempest_list'
@@ -166,24 +171,23 @@ class OSTempestTesting(unittest.TestCase):
                 mock_logger_info. \
                     assert_any_call("Starting Tempest test suite: '%s'.", cmd)
 
-    @mock.patch('functest.opnfv_tests.openstack.tempest.tempest.'
-                'subprocess.Popen')
+    @mock.patch('subprocess.check_output')
     def test_generate_report(self, mock_popen):
         self.tempestcommon.verification_id = "1234"
-        html_file = os.path.join(tempest.TempestCommon.TEMPEST_RESULTS_DIR,
-                                 "tempest-report.html")
+        html_file = os.path.join(
+            os.path.join(
+                getattr(config.CONF, 'dir_results'),
+                self.tempestcommon.case_name),
+            "tempest-report.html")
         cmd = ["rally", "verify", "report", "--type", "html", "--uuid",
                "1234", "--to", html_file]
         self.tempestcommon.generate_report()
-        mock_popen.assert_called_once_with(cmd, stdout=mock.ANY,
-                                           stderr=mock.ANY)
+        mock_popen.assert_called_once_with(cmd)
 
     @mock.patch('functest.opnfv_tests.openstack.tempest.tempest.'
                 'os.path.exists', return_value=False)
     @mock.patch('functest.opnfv_tests.openstack.tempest.tempest.os.makedirs',
                 side_effect=Exception)
-    @mock.patch('functest.opnfv_tests.openstack.tempest.tempest.'
-                'TempestResourcesManager.cleanup')
     def test_run_makedirs_ko(self, *args):
         # pylint: disable=unused-argument
         self.assertEqual(self.tempestcommon.run(),
@@ -192,10 +196,6 @@ class OSTempestTesting(unittest.TestCase):
     @mock.patch('functest.opnfv_tests.openstack.tempest.tempest.'
                 'os.path.exists', return_value=False)
     @mock.patch('functest.opnfv_tests.openstack.tempest.tempest.os.makedirs')
-    @mock.patch('functest.opnfv_tests.openstack.tempest.tempest.'
-                'TempestResourcesManager.create', side_effect=Exception)
-    @mock.patch('functest.opnfv_tests.openstack.tempest.tempest.'
-                'TempestResourcesManager.cleanup')
     def test_run_create_resources_ko(self, *args):
         # pylint: disable=unused-argument
         self.assertEqual(self.tempestcommon.run(),
@@ -204,10 +204,6 @@ class OSTempestTesting(unittest.TestCase):
     @mock.patch('functest.opnfv_tests.openstack.tempest.tempest.'
                 'os.path.exists', return_value=False)
     @mock.patch('functest.opnfv_tests.openstack.tempest.tempest.os.makedirs')
-    @mock.patch('functest.opnfv_tests.openstack.tempest.tempest.'
-                'TempestResourcesManager.create', return_value={})
-    @mock.patch('functest.opnfv_tests.openstack.tempest.tempest.'
-                'TempestResourcesManager.cleanup')
     @mock.patch('functest.opnfv_tests.openstack.tempest.tempest.'
                 'TempestCommon.configure', side_effect=Exception)
     def test_run_configure_tempest_ko(self, *args):
@@ -218,10 +214,6 @@ class OSTempestTesting(unittest.TestCase):
     @mock.patch('functest.opnfv_tests.openstack.tempest.tempest.'
                 'os.path.exists', return_value=False)
     @mock.patch('functest.opnfv_tests.openstack.tempest.tempest.os.makedirs')
-    @mock.patch('functest.opnfv_tests.openstack.tempest.tempest.'
-                'TempestResourcesManager.create', return_value={})
-    @mock.patch('functest.opnfv_tests.openstack.tempest.tempest.'
-                'TempestResourcesManager.cleanup')
     @mock.patch('functest.opnfv_tests.openstack.tempest.tempest.'
                 'TempestCommon.configure')
     def _test_run(self, status, *args):
@@ -259,8 +251,11 @@ class OSTempestTesting(unittest.TestCase):
                                   side_effect=Exception):
             self._test_run(testcase.TestCase.EX_RUN_ERROR)
 
-    def test_run(self):
-        with mock.patch.object(self.tempestcommon, 'generate_test_list'), \
+    @mock.patch('functest.opnfv_tests.openstack.tempest.tempest.TempestCommon.'
+                'run', return_value=testcase.TestCase.EX_OK)
+    def test_run(self, *args):
+        with mock.patch.object(self.tempestcommon, 'update_rally_regex'), \
+                mock.patch.object(self.tempestcommon, 'generate_test_list'), \
                 mock.patch.object(self.tempestcommon,
                                   'apply_tempest_blacklist'), \
                 mock.patch.object(self.tempestcommon, 'run_verifier_tests'), \
@@ -268,6 +263,7 @@ class OSTempestTesting(unittest.TestCase):
                                   'parse_verifier_result'), \
                 mock.patch.object(self.tempestcommon, 'generate_report'):
             self._test_run(testcase.TestCase.EX_OK)
+            args[0].assert_called_once_with()
 
 
 if __name__ == "__main__":