openstack/glance
Code Issues Proposed changes

Merge "Set status to 'active' after image is uploaded"

Browse Source
This commit is contained in:
Jenkins
2013-03-02 00:38:09 +00:00
committed by Gerrit Code Review
parent a9fdfa3eee 85e3b9f160
commit 103b9459c2
4 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -81,6 +81,18 @@ class TestStoreImage(utils.BaseTestCase):
#NOTE(markwash): FakeStore returns image_id for location
self.assertEquals(image.location, UUID2)
self.assertEquals(image.checksum, 'Z')
self.assertEquals(image.status, 'active')
def test_image_set_data_unknown_size(self):
context = glance.context.RequestContext(user=USER1)
image_stub = ImageStub(UUID2, status='queued', location=None)
image = glance.store.ImageProxy(image_stub, context, self.store_api)
image.set_data('YYYY', None)
self.assertEquals(image.size, 4)
#NOTE(markwash): FakeStore returns image_id for location
self.assertEquals(image.location, UUID2)
self.assertEquals(image.checksum, 'Z')
self.assertEquals(image.status, 'active')
def test_image_repo_get(self):
image_repo = glance.store.ImageRepoProxy({}, self.store_api,

6
glance/tests/unit/utils.py
View File

@@ -122,13 +122,15 @@ class FakeStoreAPI(object):
for location in self.data.keys():
if image_id in location:
raise exception.Duplicate()
if size and (current_store_size + size) > store_max_size:
if not size:
size = len(data)
if (current_store_size + size) > store_max_size:
raise exception.StorageFull()
if context.user == USER2:
raise exception.Forbidden()
if context.user == USER3:
raise exception.StorageWriteDenied()
self.data[image_id] = (data, size or len(data))
self.data[image_id] = (data, size)
checksum = 'Z'
return (image_id, size, checksum)