openstack/cinder
Code Issues Proposed changes

Simplify calls to mock_object

Browse Source 
mock_object method in TestCase class now accepts keyword arguments that
will be properly handled when no new object is provided, so we can now
simplify calls in our tests.

This patch changes calls like
    self.mock_object(os.path, 'exists', mock.Mock(return_value=True))
into
    self.mock_object(os.path, 'exists', return_value=True)

Change-Id: I904ab4956a081c0292e2c982320e5005b055d3d5
This commit is contained in:
Gorka Eguileor
2016-08-29 13:56:38 +02:00
parent 344f230990
commit ef44589948
44 changed files with 1217 additions and 1534 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cinder/tests/unit/volume/drivers/netapp/dataontap/client/test_client_base.py
View File

@@ -525,8 +525,8 @@ class NetAppBaseClientTestCase(test.TestCase):
asserted_api_args)
def test_create_cg_snapshot(self):
self.mock_object(self.client, '_start_cg_snapshot', mock.Mock(
return_value=fake.CONSISTENCY_GROUP_ID))
self.mock_object(self.client, '_start_cg_snapshot',
return_value=fake.CONSISTENCY_GROUP_ID)
self.mock_object(self.client, '_commit_cg_snapshot')
self.client.create_cg_snapshot([fake.CG_VOLUME_NAME],
@@ -536,8 +536,7 @@ class NetAppBaseClientTestCase(test.TestCase):
fake.CONSISTENCY_GROUP_ID)
def test_create_cg_snapshot_no_id(self):
self.mock_object(self.client, '_start_cg_snapshot', mock.Mock(
return_value=None))
self.mock_object(self.client, '_start_cg_snapshot', return_value=None)
self.assertRaises(exception.VolumeBackendAPIException,
self.client.create_cg_snapshot,
@@ -573,10 +572,8 @@ class NetAppBaseClientTestCase(test.TestCase):
# Need to mock sleep as it is called by @utils.retry
self.mock_object(time, 'sleep')
mock_get_snapshot = self.mock_object(
self.client, 'get_snapshot',
mock.Mock(return_value=BUSY_SNAPSHOT)
)
mock_get_snapshot = self.mock_object(self.client, 'get_snapshot',
return_value=BUSY_SNAPSHOT)
self.assertRaises(exception.SnapshotIsBusy,
self.client.wait_for_busy_snapshot,