openstack
/
glance
Code Issues Proposed changes

Provide explicit image create value for test_image_paginate case 

Assign an explicit created_at datetime value to image db fixtures,
it be used to fixes race condition in DB driver test_image_paginate
case.

Closes-Bug: #1282400
Change-Id: I359633af4bb25cf1866b42d6dad3df658995b7bd
Signed-off-by: Zhi Yan Liu <zhiyanl@cn.ibm.com>
This commit is contained in:
Zhi Yan Liu 2014-01-31 23:26:02 +08:00 committed by Gerrit Code Review
parent c6365cc4f5
commit 1c5797d53a
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
glance/tests/functional/db/base.py
View File

@ -700,15 +700,21 @@ class DriverTests(object):
def test_image_paginate(self):
"""Paginate through a list of images using limit and marker"""
extra_uuids = [str(uuid.uuid4()) for i in range(2)]
extra_images = [build_image_fixture(id=_id) for _id in extra_uuids]
now = timeutils.utcnow()
extra_uuids = [(str(uuid.uuid4()),
now + datetime.timedelta(seconds=i * 5))
for i in range(2)]
extra_images = [build_image_fixture(id=_id,
created_at=_dt,
updated_at=_dt)
for _id, _dt in extra_uuids]
self.create_images(extra_images)
# Reverse uuids to match default sort of created_at
extra_uuids.reverse()
page = self.db_api.image_get_all(self.context, limit=2)
self.assertEqual(extra_uuids, [i['id'] for i in page])
self.assertEqual([i[0] for i in extra_uuids], [i['id'] for i in page])
last = page[-1]['id']
page = self.db_api.image_get_all(self.context, limit=2, marker=last)