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=a542bbb256135024997b275204fb199ffa9de22e;hpb=5b5e96a56c9b1eb128e699f245dceb54dc7e8160;p=functest.git

diff --git a/functest/tests/unit/openstack/tempest/test_tempest.py b/functest/tests/unit/openstack/tempest/test_tempest.py
index a542bbb25..c1f245c72 100644
--- a/functest/tests/unit/openstack/tempest/test_tempest.py
+++ b/functest/tests/unit/openstack/tempest/test_tempest.py
@@ -23,9 +23,16 @@ 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'), \
@@ -75,6 +82,7 @@ class OSTempestTesting(unittest.TestCase):
         else:
             testr_mode = self.tempestcommon.mode
         verifier_repo_dir = 'test_verifier_repo_dir'
+        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(mode=testr_mode)
@@ -163,8 +171,7 @@ 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(
@@ -175,8 +182,7 @@ class OSTempestTesting(unittest.TestCase):
         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)