summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-04-01 22:29:21 +0000
committerGerrit Code Review <review@openstack.org>2015-04-01 22:29:21 +0000
commite57c70b94cb780584d7ed3bc9a3d30e635d73977 (patch)
tree8dfc6994318f889d0bbc2da4e0b8ab581d1c8aff
parenta7d63728565a403b5199e492cd212982222a210f (diff)
parentaefab89a3644ece1013b92d6ca918922efba8d0f (diff)
downloadglance-e57c70b94cb780584d7ed3bc9a3d30e635d73977.tar.gz
Merge "Fix intermittent unit test failures"
-rw-r--r--glance/tests/unit/v2/test_images_resource.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/glance/tests/unit/v2/test_images_resource.py b/glance/tests/unit/v2/test_images_resource.py
index 8ed816df4..9f75bc9d1 100644
--- a/glance/tests/unit/v2/test_images_resource.py
+++ b/glance/tests/unit/v2/test_images_resource.py
@@ -1366,6 +1366,8 @@ class TestImagesController(base.IsolatedUnitTest):
request, UUID1, changes)
def test_update_replace_locations_status_exception(self):
+ self.stubs.Set(store, 'get_size_from_backend',
+ unit_test_utils.fake_get_size_from_backend)
request = unit_test_utils.get_fake_request()
changes = [{'op': 'replace', 'path': ['locations'], 'value': []}]
output = self.controller.update(request, UUID2, changes)
@@ -1505,6 +1507,8 @@ class TestImagesController(base.IsolatedUnitTest):
request, UUID1, changes)
def test_update_add_locations_status_exception(self):
+ self.stubs.Set(store, 'get_size_from_backend',
+ unit_test_utils.fake_get_size_from_backend)
request = unit_test_utils.get_fake_request()
changes = [{'op': 'replace', 'path': ['locations'], 'value': []}]
output = self.controller.update(request, UUID2, changes)
@@ -1534,6 +1538,8 @@ class TestImagesController(base.IsolatedUnitTest):
request, UUID1, changes)
def test_update_replace_duplicate_locations(self):
+ self.stubs.Set(store, 'get_size_from_backend',
+ unit_test_utils.fake_get_size_from_backend)
request = unit_test_utils.get_fake_request()
changes = [{'op': 'replace', 'path': ['locations'], 'value': []}]
output = self.controller.update(request, UUID1, changes)