Mock leaked _execute() calls in driver tests

Some drivers have _execute() calls being linked, causing tests to prompt
for password and eventual fail for time out. This prevents those
_execute calls from happening.

Closes-Bug: #1404414
Change-Id: I43a11c065799efe6f5b81dc15e1f7232c80d1070

diff --git a/cinder/tests/test_huaweistorac.py b/cinder/tests/test_huaweistorac.py
index 23dfdbce7cc40689a43a012281817520f1cb8524..6bb52dd66ccc3f825b9c84e08c01c3aef33d0c41 100644 (file)
--- a/cinder/tests/test_huaweistorac.py
+++ b/cinder/tests/test_huaweistorac.py
@@ -390,6 +390,7 @@ class StorACDriverTestCase(test.TestCase):
         self.assertEqual('volume-21ec7341-9256-497b-97d9-ef48edcf0635',
                          retval['provider_location'])
 
+    @mock.patch.object(brick_connector, 'get_connector_properties')
     @mock.patch.object(brick_connector.HuaweiStorHyperConnector,
                        'is_volume_connected')
     @mock.patch.object(brick_connector.HuaweiStorHyperConnector,
@@ -404,7 +405,8 @@ class StorACDriverTestCase(test.TestCase):
                                      mock_connect_volume,
                                      mock_is_volume_connected,
                                      mock__attach_volume,
-                                     mock__detach_volume):
+                                     mock__detach_volume,
+                                     mock__get_connector_properties):
             mock_disconnect_volume.return_value = None
             mock_connect_volume.return_value = {'type': 'block',
                                                 'path': '/dev/null'}
@@ -412,6 +414,7 @@ class StorACDriverTestCase(test.TestCase):
             mock_is_volume_connected.return_value = True
             mock__attach_volume.return_value = None
             mock__detach_volume.return_value = None
+            mock__get_connector_properties.return_value = {}
 
             self.driver.delete_snapshot(test_snap)
             self.assertEqual('0', FakeVbsClient.retcode)

diff --git a/cinder/tests/test_zfssa.py b/cinder/tests/test_zfssa.py
index 9ce5e95bca7018af752d987c7dc099e3b3d7eed7..b0fdcf8f403cfab1910053c49a8a7466879ee826 100644 (file)
--- a/cinder/tests/test_zfssa.py
+++ b/cinder/tests/test_zfssa.py
@@ -23,6 +23,7 @@ from oslo.utils import units
 
 from cinder.openstack.common import log as logging
 from cinder import test
+from cinder.tests import fake_utils
 from cinder.volume import configuration as conf
 from cinder.volume.drivers.zfssa import restclient as client
 from cinder.volume.drivers.zfssa import zfssaiscsi as iscsi
@@ -323,6 +324,7 @@ class TestZFSSAISCSIDriver(test.TestCase):
         super(TestZFSSAISCSIDriver, self).setUp()
         self._create_fake_config()
         _factory_zfssa.return_value = FakeZFSSA()
+        iscsi.ZFSSAISCSIDriver._execute = fake_utils.fake_execute
         self.drv = iscsi.ZFSSAISCSIDriver(configuration=self.configuration)
         self.drv.do_setup({})
 
@@ -470,6 +472,7 @@ class TestZFSSANFSDriver(test.TestCase):
         self._create_fake_config()
         _factory_zfssa.return_value = FakeNFSZFSSA()
         self.drv = zfssanfs.ZFSSANFSDriver(configuration=self.configuration)
+        self.drv._execute = fake_utils.fake_execute
         self.drv.do_setup({})
 
     def _create_fake_config(self):