openstack
/
glance
Code Issues Proposed changes

Upgrade tests' mocks to match glance_store 

Latest glanec_store release added a new `context` keyword to some
functions. This broke backwards compatibility for some of the tests in
master and juno.

This change adds the corresponding keyword to the mock calls.

Closes-bug: #1391437

Change-Id: I5e58462e4c076b3ea56e27361eb6c3b0aafa2493
This commit is contained in:
Flavio Percoco 2014-11-11 16:54:42 +01:00
parent fed99f9594
commit 6b3edb2a48
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
glance/tests/unit/test_store_image.py
View File

@ -859,8 +859,9 @@ class TestStoreAddToBackend(utils.BaseTestCase):
def _bad_metadata(self, in_metadata):
mstore = self.mox.CreateMockAnything()
mstore.add(self.image_id, mox.IgnoreArg(), self.size).AndReturn(
(self.location, self.size, self.checksum, in_metadata))
mstore.add(self.image_id, mox.IgnoreArg(),
self.size, context=None).AndReturn(
(self.location, self.size, self.checksum, in_metadata))
mstore.__str__ = lambda: "hello"
mstore.__unicode__ = lambda: "hello"
@ -877,8 +878,9 @@ class TestStoreAddToBackend(utils.BaseTestCase):
def _good_metadata(self, in_metadata):
mstore = self.mox.CreateMockAnything()
mstore.add(self.image_id, mox.IgnoreArg(), self.size).AndReturn(
(self.location, self.size, self.checksum, in_metadata))
mstore.add(self.image_id, mox.IgnoreArg(),
self.size, context=None).AndReturn(
(self.location, self.size, self.checksum, in_metadata))
self.mox.ReplayAll()
(location,
@ -935,8 +937,9 @@ class TestStoreAddToBackend(utils.BaseTestCase):
def test_bad_metadata_not_dict(self):
store = self.mox.CreateMockAnything()
store.add(self.image_id, mox.IgnoreArg(), self.size).AndReturn(
(self.location, self.size, self.checksum, []))
store.add(self.image_id, mox.IgnoreArg(),
self.size, context=None).AndReturn(
(self.location, self.size, self.checksum, []))
store.__str__ = lambda: "hello"
store.__unicode__ = lambda: "hello"

2
glance/tests/unit/v1/test_upload_utils.py
View File

@ -110,7 +110,7 @@ class TestUploadUtils(base.StoreClearingUnitTest):
update_data)
store.add.assert_called_once_with(image_meta['id'], mock.ANY,
image_meta['size'])
image_meta['size'], context=mock.ANY)
def test_upload_data_to_store(self):
req = unit_test_utils.get_fake_request()