x
/
cloudroast
Code Issues Proposed changes

Changes to Expiring Objects Tests 

* Removed container list assertions from
  test_object_deletion_with_x_delete_at. The
  container list can potentially take days
  to be corrected with expiring objects, so
  asserting on the list is not a valid testing
  option.
* Changed two uses of sleep() to use the
  wait time retrieved from the config for
  better consistency across the tests that use
  the x_delete_at parameter.

Change-Id: I289081529cab38056ec1573b33e6cb70a928b069
This commit is contained in:
josh7810 2016-06-02 13:41:18 -05:00
parent 35f4f4e74f
commit b5c3ee9e09
1 changed files with 3 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
cloudroast/objectstorage/regression/features/expiring_objects_test.py
View File

@ -53,8 +53,8 @@ class ExpiringObjectTest(ObjectStorageFixture):
content_length = response.headers.get('content-length')
self.assertNotEqual(content_length, 0)
# wait for the object to expire - future_time + 10 seconds
sleep(70)
# Wait for object to expire using interval from config
sleep(self.objectstorage_api_config.object_deletion_wait_interval)
response = self.client.get_object(container_name, object_name)
@ -176,8 +176,7 @@ class ExpiringObjectTest(ObjectStorageFixture):
received=str(received)))
# Wait for object to expire using interval from config
sleep(
self.objectstorage_api_config.object_deletion_wait_interval)
sleep(self.objectstorage_api_config.object_deletion_wait_interval)
object_response = self.client.get_object(container_name, object_name)
@ -241,28 +240,3 @@ class ExpiringObjectTest(ObjectStorageFixture):
self.assertEqual(
404, resp.status_code,
'Object should be deleted after X-Delete-At.')
# wait for the container listing to be updated
sleep(self.objectstorage_api_config.object_deletion_wait_interval)
get_response = self.client.list_objects(container_name)
self.assertEqual(
204, get_response.status_code,
'No content should be returned for the request.')
self.assertEqual(
0, int(get_response.headers.get('x-container-object-count')),
'No objects should be listed in the container. Object count was '
'{0}'.format(get_response.headers.get('x-container-object-count')))
self.assertIsNone(get_response.entity,
'There should not be a response entity. '
'Response entity was {0}'.format(
get_response.entity))
head_response = self.client.get_container_metadata(container_name)
self.assertEqual(
0, int(head_response.headers.get('x-container-object-count')),
'No objects should be listed in the container.')