From 82ed9a4ce2def89259cb9712deae0c234f837621 Mon Sep 17 00:00:00 2001
From: Luke Wollney <luke.wollney@rackspace.com>
Date: Wed, 23 Sep 2015 12:59:10 -0500
Subject: [PATCH] Update list images tests

*Updated list images tests that fail due to the environment
containing images that use certain naming conventions.
Because the way Glance sorts lists of images
vs the way that our tests expect images to be sorted, some
tests fail when we sort lists of images by name and expect
them to be in a certain order.
*Some tests now use created_at as a sort_type and others
only sort the base images to avoid any naming convention
issues when there are unknown images in the environment.
*Updated comment about when to verify sizes

Change-Id: I797091bc92b39165618959b7f0e78535708a1cc7
---
 .../image_operations/list_images_test.py      | 45 +++++++------------
 1 file changed, 17 insertions(+), 28 deletions(-)

diff --git a/cloudroast/glance/regression/image_operations/list_images_test.py b/cloudroast/glance/regression/image_operations/list_images_test.py
index 8540376d..70c6a042 100644
--- a/cloudroast/glance/regression/image_operations/list_images_test.py
+++ b/cloudroast/glance/regression/image_operations/list_images_test.py
@@ -519,14 +519,14 @@ class ListImages(ImagesIntegrationFixture):
         ImagesDatasetListGenerator.ListImagesSort())
     def ddtest_sort_images_list(self, params):
         """
-        @summary: List all images, sorting the list by passing in a query
+        @summary: List all base images, sorting the list by passing in a query
         parameter as the sort_key and a direction as the sort_dir
 
         @param params: Parameter being passed to the list images request
         @type params: Dictionary
 
-        1) List all images passing in a query parameter as the sort_key and a
-        direction as the sort_dir
+        1) List all base images passing in a query parameter as the sort_key
+        and a direction as the sort_dir
         2) Verify that the list of images returned is not empty
         3) Verify that each image returned is in order based on the sort_key
         and sort_dir
@@ -544,6 +544,8 @@ class ListImages(ImagesIntegrationFixture):
             elif key == 'sort_key':
                 sort_key = params[key]
 
+        params.update({'image_type': ImageType.BASE})
+
         listed_images = self.images.behaviors.list_all_images(**params)
         self.assertNotEqual(
             len(listed_images), 0,
@@ -590,25 +592,19 @@ class ListImages(ImagesIntegrationFixture):
         second sort_key (descending by default)
         """
 
-        listed_images = self._list_images_with_sort_keys_dirs(['name', 'size'])
+        listed_images = self._list_images_with_sort_keys_dirs(
+            ['created_at', 'size'])
 
         for current, next_ in zip(listed_images[0::2], listed_images[1::2]):
-            current_name = current.name
-            next_name = next_.name
-            if current_name is not None:
-                current_name = current_name.lower()
-            if next_name is not None:
-                next_name = next_name.lower()
-
             self.assertGreaterEqual(
-                current_name, next_name,
+                current.created_at, next_.created_at,
                 msg=('Unexpected order of images {0} and {1} received. '
                      'Expected: Greater than or equal to {2} Received: '
-                     '{3}').format(next_.id_, current.id_, next_name,
-                                   current_name))
+                     '{3}').format(next_.id_, current.id_, next_.created_at,
+                                   current.created_at))
 
-            # If names are equal, verify that sizes are in expected order
-            if current_name == next_name:
+            # If created_at dates are equal, verify sizes are in expected order
+            if current.created_at == next_.created_at:
                 self.assertGreaterEqual(
                     current.size, next_.size,
                     msg=('Unexpected order of images {0} and {1} received.'
@@ -674,24 +670,17 @@ class ListImages(ImagesIntegrationFixture):
         """
 
         listed_images = self._list_images_with_sort_keys_dirs(
-            ['name', 'size'], [SortDirection.ASCENDING])
+            ['created_at', 'size'], [SortDirection.ASCENDING])
 
         for current, next_ in zip(listed_images[0::2], listed_images[1::2]):
-            current_name = current.name
-            next_name = next_.name
-            if current_name is not None:
-                current_name = current_name.lower()
-            if next_name is not None:
-                next_name = next_name.lower()
-
             self.assertLessEqual(
-                current_name, next_name,
+                current.created_at, next_.created_at,
                 msg=('Unexpected order of images {0} and {1} received.'
                      'Expected: Less than or equal to {2} Received: '
-                     '{3}').format(next_.id_, current.id_, next_name,
-                                   current_name))
+                     '{3}').format(next_.id_, current.id_, next_.created_at,
+                                   current.created_at))
 
-            if current_name == next_name:
+            if current.created_at == next_.created_at:
                 self.assertLessEqual(
                     current.size, next_.size,
                     msg=('Unexpected order of images {0} and {1} received.'