diff options
| author | Flavio Percoco <flaper87@gmail.com> | 2014-11-11 16:54:42 +0100 |
|---|---|---|
| committer | Flavio Percoco <flaper87@gmail.com> | 2014-11-11 17:25:25 +0100 |
| commit | 540306eccb60b8cd5ecd86c3d15ed51291d98d15 (patch) | |
| tree | 33b00ee3c0a9064d6d79f532ae3d84b2e3a6ec9e | |
| parent | 41e143b2172a36e4f49bc7e3a1ed97ee8477afb9 (diff) | |
| download | glance-540306eccb60b8cd5ecd86c3d15ed51291d98d15.tar.gz | |
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
(cherry picked from commit 6b3edb2a48e3d77a623862853690bb72f31d213a)
| -rw-r--r-- | glance/tests/unit/test_store_image.py | 15 | ||||
| -rw-r--r-- | glance/tests/unit/v1/test_upload_utils.py | 2 |
2 files changed, 10 insertions, 7 deletions
diff --git a/glance/tests/unit/test_store_image.py b/glance/tests/unit/test_store_image.py index 4ebaf6cff..665f126ae 100644 --- a/glance/tests/unit/test_store_image.py +++ b/glance/tests/unit/test_store_image.py @@ -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" diff --git a/glance/tests/unit/v1/test_upload_utils.py b/glance/tests/unit/v1/test_upload_utils.py index a50fbf88d..40e718dec 100644 --- a/glance/tests/unit/v1/test_upload_utils.py +++ b/glance/tests/unit/v1/test_upload_utils.py @@ -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() |