openstack/swift
Code Issues Proposed changes

Merge "Add tests for X-Backend-Clean-Expiring-Object-Queue true"

Browse Source
This commit is contained in:
Zuul 2018-01-17 05:30:45 +00:00 committed by Gerrit Code Review
commit 7227d9967b
1 changed files with 89 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

136
test/unit/obj/test_server.py
View File

@ -5427,35 +5427,65 @@ class TestObjectController(unittest.TestCase):
self.assertTrue('chost,badhost' in msg) self.assertTrue('chost,badhost' in msg)
self.assertTrue('cdevice' in msg) self.assertTrue('cdevice' in msg)
def test_delete_at_update_on_put(self): def test_delete_at_update_on_put_and_post(self):
# Test how delete_at_update works when issued a delete for old # Test how delete_at_update works when issued a delete for old
# expiration info after a new put with no new expiration info. # expiration info after a new put/post with no new expiration info.
policy = random.choice(list(POLICIES)) policy = random.choice(list(POLICIES))
given_args = []
def fake_async_update(*args): def do_test(method, headers, expected_args):
given_args.extend(args) given_args = []
req = Request.blank( def fake_async_update(*args):
'/v1/a/c/o', given_args.extend(args)
environ={'REQUEST_METHOD': 'PUT'},
headers={'X-Timestamp': 1, headers.update({'X-Timestamp': 1,
'X-Trans-Id': '123', 'X-Trans-Id': '123',
'X-Backend-Storage-Policy-Index': int(policy)}) 'X-Backend-Storage-Policy-Index': int(policy)})
with mock.patch.object(self.object_controller, 'async_update', req = Request.blank(
fake_async_update): '/v1/a/c/o',
self.object_controller.delete_at_update( environ={'REQUEST_METHOD': method},
'DELETE', 2, 'a', 'c', 'o', req, 'sda1', policy) headers=headers)
self.assertEqual( with mock.patch.object(self.object_controller, 'async_update',
given_args, [ fake_async_update):
'DELETE', '.expiring_objects', '0000000000', self.object_controller.delete_at_update(
'0000000002-a/c/o', None, None, None, 'DELETE', 2, 'a', 'c', 'o', req, 'sda1', policy)
HeaderKeyDict({ self.assertEqual(expected_args, given_args)
'X-Backend-Storage-Policy-Index': 0,
'x-timestamp': utils.Timestamp('1').internal, expected_args = [
'x-trans-id': '123', 'DELETE', '.expiring_objects', '0000000000',
'referer': 'PUT http://localhost/v1/a/c/o'}), '0000000002-a/c/o', None, None, None,
'sda1', policy]) HeaderKeyDict({
'X-Backend-Storage-Policy-Index': 0,
'x-timestamp': utils.Timestamp('1').internal,
'x-trans-id': '123',
'referer': 'PUT http://localhost/v1/a/c/o'}),
'sda1', policy]
do_test('PUT', {}, expected_args)
do_test('PUT', {'X-Backend-Clean-Expiring-Object-Queue': 'true'},
expected_args)
do_test('PUT', {'X-Backend-Clean-Expiring-Object-Queue': 't'},
expected_args)
expected_args = [
'DELETE', '.expiring_objects', '0000000000',
'0000000002-a/c/o', None, None, None,
HeaderKeyDict({
'X-Backend-Storage-Policy-Index': 0,
'x-timestamp': utils.Timestamp('1').internal,
'x-trans-id': '123',
'referer': 'POST http://localhost/v1/a/c/o'}),
'sda1', policy]
do_test('POST', {}, expected_args)
do_test('POST', {'X-Backend-Clean-Expiring-Object-Queue': 'true'},
expected_args)
do_test('POST', {'X-Backend-Clean-Expiring-Object-Queue': 't'},
expected_args)
do_test('PUT', {'X-Backend-Clean-Expiring-Object-Queue': 'false'}, [])
do_test('PUT', {'X-Backend-Clean-Expiring-Object-Queue': 'f'}, [])
do_test('POST', {'X-Backend-Clean-Expiring-Object-Queue': 'false'}, [])
do_test('POST', {'X-Backend-Clean-Expiring-Object-Queue': 'f'}, [])
def test_delete_at_negative(self): def test_delete_at_negative(self):
# Test how delete_at_update works when issued a delete for old # Test how delete_at_update works when issued a delete for old
@ -5590,30 +5620,42 @@ class TestObjectController(unittest.TestCase):
def test_delete_at_update_delete(self): def test_delete_at_update_delete(self):
policy = random.choice(list(POLICIES)) policy = random.choice(list(POLICIES))
given_args = []
def fake_async_update(*args): def do_test(headers, expected_args):
given_args.extend(args) given_args = []
self.object_controller.async_update = fake_async_update def fake_async_update(*args):
req = Request.blank( given_args.extend(args)
'/v1/a/c/o',
environ={'REQUEST_METHOD': 'DELETE'}, self.object_controller.async_update = fake_async_update
headers={'X-Timestamp': 1,
'X-Trans-Id': '1234', headers.update({'X-Timestamp': 1,
'X-Backend-Storage-Policy-Index': int(policy)}) 'X-Trans-Id': '1234',
self.object_controller.delete_at_update('DELETE', 2, 'a', 'c', 'o', 'X-Backend-Storage-Policy-Index': int(policy)})
req, 'sda1', policy) req = Request.blank(
self.assertEqual( '/v1/a/c/o',
given_args, [ environ={'REQUEST_METHOD': 'DELETE'},
'DELETE', '.expiring_objects', '0000000000', headers=headers)
'0000000002-a/c/o', None, None, self.object_controller.delete_at_update('DELETE', 2, 'a', 'c', 'o',
None, HeaderKeyDict({ req, 'sda1', policy)
'X-Backend-Storage-Policy-Index': 0, self.assertEqual(expected_args, given_args)
'x-timestamp': utils.Timestamp('1').internal,
'x-trans-id': '1234', expected_args = [
'referer': 'DELETE http://localhost/v1/a/c/o'}), 'DELETE', '.expiring_objects', '0000000000',
'sda1', policy]) '0000000002-a/c/o', None, None,
None, HeaderKeyDict({
'X-Backend-Storage-Policy-Index': 0,
'x-timestamp': utils.Timestamp('1').internal,
'x-trans-id': '1234',
'referer': 'DELETE http://localhost/v1/a/c/o'}),
'sda1', policy]
do_test({}, expected_args)
do_test({'X-Backend-Clean-Expiring-Object-Queue': 'true'},
expected_args)
do_test({'X-Backend-Clean-Expiring-Object-Queue': 't'}, expected_args)
do_test({'X-Backend-Clean-Expiring-Object-Queue': 'false'}, [])
do_test({'X-Backend-Clean-Expiring-Object-Queue': 'f'}, [])
def test_delete_backend_replication(self): def test_delete_backend_replication(self):
# If X-Backend-Replication: True delete_at_update should completely # If X-Backend-Replication: True delete_at_update should completely