summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStuart McLaren <stuart.mclaren@hp.com>2015-04-01 19:14:10 +0000
committerStuart McLaren <stuart.mclaren@hp.com>2015-04-01 19:14:53 +0000
commitaefab89a3644ece1013b92d6ca918922efba8d0f (patch)
tree673787bcd31c20187f9c36f68ac6de9f30dbf1bb
parent503a7bb4dd28f9659de8c7b389c91dd65dbad57e (diff)
downloadglance-aefab89a3644ece1013b92d6ca918922efba8d0f.tar.gz
Fix intermittent unit test failures
The following tests have been failing recently: test_update_add_locations_status_exception test_update_replace_duplicate_locations test_update_replace_locations_status_exception They were querying storeurl.com which redirected to www.hugedomains.com, and unexpected exchanges, eg: HTTP/1.1 302 Found. Cache-Control: private. Content-Length: 183. Content-Type: text/html; charset=utf-8. Date: Wed, 01 Apr 2015 19:05:15 GMT. Location: http://www.hugedomains.com/domain_profile.cfm?d=storeurl&e=com. Server: Microsoft-IIS/8.0. X-Powered-By: ASP.NET. Connection: keep-alive. Mocking out the get_size function prevents these real connections. Change-Id: Ia5d867f98ac60479c70362b0477c2a0571ac6e4f Closes-bug: 1437346
-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)