openstack/glance
Code Issues Proposed changes

Merge "Allow tests to run with both provenances of mox"

Browse Source
This commit is contained in:
Jenkins 2013-10-09 04:32:00 +00:00 committed by Gerrit Code Review
commit 0059c1d8aa
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -835,7 +835,7 @@ class TestStoreAddToBackend(utils.BaseTestCase):
store = self.mox.CreateMockAnything()
store.add(self.image_id, mox.IgnoreArg(), self.size).AndReturn(
(self.location, self.size, self.checksum, in_metadata))
store.__str__().AndReturn(('hello'))
store.__str__ = lambda: "hello"
self.mox.ReplayAll()
@ -910,7 +910,7 @@ class TestStoreAddToBackend(utils.BaseTestCase):
store = self.mox.CreateMockAnything()
store.add(self.image_id, mox.IgnoreArg(), self.size).AndReturn(
(self.location, self.size, self.checksum, []))
store.__str__().AndReturn(('hello'))
store.__str__ = lambda: "hello"
self.mox.ReplayAll()