Merge "Remove unnecessary mocks in tests"

tripleoclient/tests/v1/overcloud_deploy/test_overcloud_deploy.py

@@ -106,17 +106,10 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
         horizon_url.return_value = 'fake://url:12345'
         self.addCleanup(horizon_url.stop)
 
-        self.mock_tar = mock.patch(
-            'tripleo_common.utils.tarball.create_tarball',
-            autospec=True
-        )
-        self.mock_tar.start()
-
     def tearDown(self):
         super(TestDeployOvercloud, self).tearDown()
         os.unlink(self.parameter_defaults_env_file)
         shutil.rmtree = self.real_shutil
-        self.mock_tar.stop()
 
     @mock.patch('tripleoclient.utils.build_stack_data', autospec=True)
     @mock.patch('tripleo_common.utils.plan.default_image_params',

tripleoclient/tests/workflows/test_parameters.py

@@ -34,44 +34,7 @@ class TestParameterWorkflows(utils.TestCommand):
 
     def setUp(self):
         super(TestParameterWorkflows, self).setUp()
-        self.app.client_manager.workflow_engine = self.workflow = mock.Mock()
-        self.orchestration = mock.Mock()
-        self.tripleoclient = mock.Mock()
-        self.tripleoclient.object_store = mock.MagicMock()
-        self.app.client_manager.tripleoclient = self.tripleoclient
-        self.app.client_manager.orchestration = self.orchestration
         self.app.client_manager.baremetal = mock.Mock()
-        self.app.client_manager.compute = mock.Mock()
-        execution = mock.Mock()
-        execution.id = "IDID"
-        self.workflow.executions.create.return_value = execution
-        get_container = self.tripleoclient.object_store.get_container \
-            = mock.MagicMock()
-        get_container.return_value = ('container', [{'name': 'f1'}])
-
-        flatten = mock.patch(
-            'tripleo_common.utils.stack_parameters.get_flattened_parameters',
-            autospec=True,
-            return_value={
-                'environment_parameters': {
-                    'TestParameter1': {},
-                    'TestRole1': 'TestParameter2'
-                },
-                'heat_resource_tree': {
-                    'parameters': {
-                        'TestParameter2': {
-                            'name': 'TestParameter2',
-                            'tags': [
-                                'role_specific'
-                            ]
-                        }
-                    },
-                    'resources': {}
-                }
-            }
-        )
-        flatten.start()
-        self.addCleanup(flatten.stop)
 
     @mock.patch('yaml.safe_load')
     @mock.patch("six.moves.builtins.open")