summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-06-26 19:06:14 +0000
committerGerrit Code Review <review@openstack.org>2015-06-26 19:06:14 +0000
commitdc4a1cf6517c7dff5e9531bf57b3b7fea231cc12 (patch)
treeb001afa9708ce5c93305302a4b7ba4dde294d456
parent01c8ccdcf5e9c8bacabf84930e802a8ebaf0448d (diff)
parentef2447e9d273a37b896de05d0ddfe74220034596 (diff)
downloadglance_store-dc4a1cf6517c7dff5e9531bf57b3b7fea231cc12.tar.gz
Merge "Fix random test error in swift store delete"
-rw-r--r--glance_store/tests/unit/test_swift_store.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/glance_store/tests/unit/test_swift_store.py b/glance_store/tests/unit/test_swift_store.py
index d4547c8..c83381e 100644
--- a/glance_store/tests/unit/test_swift_store.py
+++ b/glance_store/tests/unit/test_swift_store.py
@@ -900,14 +900,14 @@ class SwiftTests(object):
def fake_get_container(container, **kwargs):
# Returning 5 fake segments
- return None, [{'name': '%s-%05d' % (test_image_id, x)}
+ return None, [{'name': '%s-%03d' % (test_image_id, x)}
for x in range(1, 6)]
def fake_delete_object(container, object_name):
# Simulate error on 1st and 3rd segments
global SWIFT_DELETE_OBJECT_CALLS
SWIFT_DELETE_OBJECT_CALLS += 1
- if object_name.endswith('001') or object_name.endswith('003'):
+ if object_name.endswith('-001') or object_name.endswith('-003'):
raise swiftclient.ClientException('Object DELETE failed')
else:
pass