openstack/swift
Code Issues Proposed changes

Merge "Fix intermittent bulk delete unit test failures"

Browse Source
This commit is contained in:
Jenkins 2016-07-07 17:38:35 +00:00 committed by Gerrit Code Review
commit 8dcd601496
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
test/unit/common/middleware/test_bulk.py
View File

@ -639,9 +639,9 @@ class TestDelete(unittest.TestCase):
resp_body = ''.join(self.bulk.handle_delete_iter( resp_body = ''.join(self.bulk.handle_delete_iter(
req, objs_to_delete=objs_to_delete, req, objs_to_delete=objs_to_delete,
out_content_type='application/json')) out_content_type='application/json'))
self.assertEqual( self.assertEqual(set(self.app.delete_paths),
self.app.delete_paths, ['/delete_works/AUTH_Acc/c/file_a', set(['/delete_works/AUTH_Acc/c/file_a',
'/delete_works/AUTH_Acc/c/file_d']) '/delete_works/AUTH_Acc/c/file_d']))
self.assertEqual(self.app.calls, 2) self.assertEqual(self.app.calls, 2)
resp_data = utils.json.loads(resp_body) resp_data = utils.json.loads(resp_body)
self.assertEqual(resp_data['Response Status'], '400 Bad Request') self.assertEqual(resp_data['Response Status'], '400 Bad Request')
@ -655,9 +655,9 @@ class TestDelete(unittest.TestCase):
headers={'Accept': 'application/json'}) headers={'Accept': 'application/json'})
req.method = 'POST' req.method = 'POST'
resp_body = self.handle_delete_and_iter(req) resp_body = self.handle_delete_and_iter(req)
self.assertEqual( self.assertEqual(set(self.app.delete_paths),
self.app.delete_paths, set(['/delete_works/AUTH_Acc/c/f',
['/delete_works/AUTH_Acc/c/f', '/delete_works/AUTH_Acc/c/f404']) '/delete_works/AUTH_Acc/c/f404']))
self.assertEqual(self.app.calls, 2) self.assertEqual(self.app.calls, 2)
resp_data = utils.json.loads(resp_body) resp_data = utils.json.loads(resp_body)
self.assertEqual(resp_data['Number Deleted'], 1) self.assertEqual(resp_data['Number Deleted'], 1)
@ -668,9 +668,9 @@ class TestDelete(unittest.TestCase):
headers={'Accept': 'application/json'}) headers={'Accept': 'application/json'})
req.method = 'DELETE' req.method = 'DELETE'
resp_body = self.handle_delete_and_iter(req) resp_body = self.handle_delete_and_iter(req)
self.assertEqual( self.assertEqual(set(self.app.delete_paths),
self.app.delete_paths, set(['/delete_works/AUTH_Acc/c/f',
['/delete_works/AUTH_Acc/c/f', '/delete_works/AUTH_Acc/c/f404']) '/delete_works/AUTH_Acc/c/f404']))
self.assertEqual(self.app.calls, 2) self.assertEqual(self.app.calls, 2)
resp_data = utils.json.loads(resp_body) resp_data = utils.json.loads(resp_body)
self.assertEqual(resp_data['Number Deleted'], 1) self.assertEqual(resp_data['Number Deleted'], 1)