x/cloudroast
Code Issues Proposed changes

Update list images test

Browse Source 
*Updated copyright date
*Updated the method for passing in created_at and updated_at
filters for list images requests and updated validation
accordingly
*Updated string format to use the param as the accessor

Change-Id: I931bb360edce9cccebcc09fec272e49b4e2baf26
This commit is contained in:
Luke Wollney
2016-01-07 12:58:10 -06:00
parent 57f3242ec8
commit 58f04e79dd
1 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
cloudroast/glance/regression/image_operations/list_images_test.py
View File

@@ -1,5 +1,5 @@
"""
Copyright 2015 Rackspace
Copyright 2016 Rackspace
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -14,11 +14,11 @@ See the License for the specific language governing permissions and
limitations under the License.
"""
import re
import datetime
from cafe.drivers.unittest.decorators import (
data_driven_test, DataDrivenFixture)
from cloudcafe.common.tools.datagen import rand_name
from cloudcafe.glance.common.constants import ImageProperties, Messages
from cloudcafe.glance.common.constants import Messages
from cloudcafe.glance.common.types import (
ImageMemberStatus, ImageType, ImageVisibility, SortDirection)
@@ -204,19 +204,13 @@ class ListImages(ImagesIntegrationFixture):
"""
api_args = {}
tz_regex = re.compile(ImageProperties.TZ_REGEX)
for param in params:
if param == 'id_':
api_args.update({'id': getattr(self.created_image, param)})
elif param == 'created_at' or param == 'updated_at':
param_value = str(getattr(self.created_image, param))
tz_value = tz_regex.search(param_value)
if tz_value is None:
api_args.update({param: param_value})
else:
api_args.update(
{param: param_value.replace(tz_value.group(), '')})
# Params will always only have a single value
api_args.update({param: 'lte:{0}'.format(params[param])})
else:
api_args.update({param: getattr(self.created_image, param)})
@@ -230,12 +224,25 @@ class ListImages(ImagesIntegrationFixture):
for param in params:
received = getattr(image, param)
expected = getattr(self.created_image, param)
self.assertEqual(
received, expected,
msg=('Unexpected property value for image {0} received.'
'Expected: {1} '
'Received: {2}').format(image.id_, expected,
received))
if param == 'created_at' or param == 'updated_at':
# Params will always only have a single value
received = datetime.datetime.strptime(
str(received), '%Y-%m-%d %H:%M:%S+00:00')
expected = datetime.datetime.strptime(
params[param], '%Y-%m-%dT%H:%M:%SZ')
self.assertLessEqual(
received, expected,
msg=('Unexpected property value for image {0} '
'received. Expected: {1} '
'Received: {2}').format(image.id_, expected,
received))
else:
self.assertEqual(
received, expected,
msg=('Unexpected property value for image {0} '
'received. Expected: {1} '
'Received: {2}').format(image.id_, expected,
received))
def test_filter_images_list_passing_additional_property(self):
"""