openstack/swift
Code Issues Proposed changes

py3: port object updater

Browse Source 
Change-Id: Ib1cd0659d5085ff9f8555bc08bd17a8f02f2efc0
This commit is contained in:
Tim Burke 2019-02-25 14:00:45 -08:00
parent 349c549984
commit 45994e4d31
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
test/unit/obj/test_updater.py
View File

@ -489,7 +489,7 @@ class TestObjectUpdater(unittest.TestCase):
self.assertTrue(os.path.exists(op_path)) self.assertTrue(os.path.exists(op_path))
self.assertEqual(ou.logger.get_increment_counts(), self.assertEqual(ou.logger.get_increment_counts(),
{'failures': 1, 'unlinks': 1}) {'failures': 1, 'unlinks': 1})
self.assertIsNone(pickle.load(open(op_path)).get('successes')) self.assertIsNone(pickle.load(open(op_path, 'rb')).get('successes'))
bindsock = listen_zero() bindsock = listen_zero()
@ -498,20 +498,20 @@ class TestObjectUpdater(unittest.TestCase):
with Timeout(3): with Timeout(3):
inc = sock.makefile('rb') inc = sock.makefile('rb')
out = sock.makefile('wb') out = sock.makefile('wb')
out.write('HTTP/1.1 %d OK\r\nContent-Length: 0\r\n\r\n' % out.write(b'HTTP/1.1 %d OK\r\nContent-Length: 0\r\n\r\n' %
return_code) return_code)
out.flush() out.flush()
self.assertEqual(inc.readline(), self.assertEqual(inc.readline(),
'PUT /sda1/0/a/c/o HTTP/1.1\r\n') b'PUT /sda1/0/a/c/o HTTP/1.1\r\n')
headers = HeaderKeyDict() headers = HeaderKeyDict()
line = inc.readline() line = inc.readline()
while line and line != '\r\n': while line and line != b'\r\n':
headers[line.split(':')[0]] = \ headers[line.split(b':')[0]] = \
line.split(':')[1].strip() line.split(b':')[1].strip()
line = inc.readline() line = inc.readline()
self.assertTrue('x-container-timestamp' in headers) self.assertIn(b'x-container-timestamp', headers)
self.assertTrue('X-Backend-Storage-Policy-Index' in self.assertIn(b'X-Backend-Storage-Policy-Index',
headers) headers)
except BaseException as err: except BaseException as err:
return err return err
return None return None
@ -546,7 +546,7 @@ class TestObjectUpdater(unittest.TestCase):
self.assertEqual(ou.logger.get_increment_counts(), self.assertEqual(ou.logger.get_increment_counts(),
{'failures': 1}) {'failures': 1})
self.assertEqual([0], self.assertEqual([0],
pickle.load(open(op_path)).get('successes')) pickle.load(open(op_path, 'rb')).get('successes'))
event = spawn(accept, [404, 201]) event = spawn(accept, [404, 201])
ou.logger._clear() ou.logger._clear()
@ -558,7 +558,7 @@ class TestObjectUpdater(unittest.TestCase):
self.assertEqual(ou.logger.get_increment_counts(), self.assertEqual(ou.logger.get_increment_counts(),
{'failures': 1}) {'failures': 1})
self.assertEqual([0, 2], self.assertEqual([0, 2],
pickle.load(open(op_path)).get('successes')) pickle.load(open(op_path, 'rb')).get('successes'))
event = spawn(accept, [201]) event = spawn(accept, [201])
ou.logger._clear() ou.logger._clear()
@ -867,7 +867,7 @@ class TestObjectUpdater(unittest.TestCase):
self.assertEqual([mock.ANY], async_files) self.assertEqual([mock.ANY], async_files)
async_path = os.path.join( async_path = os.path.join(
async_dir, async_subdirs[0], async_files[0]) async_dir, async_subdirs[0], async_files[0])
with open(async_path) as fd: with open(async_path, 'rb') as fd:
async_data = pickle.load(fd) async_data = pickle.load(fd)
return async_path, async_data return async_path, async_data

1
tox.ini
View File

@ -86,6 +86,7 @@ commands =
test/unit/obj/test_auditor.py \ test/unit/obj/test_auditor.py \
test/unit/obj/test_replicator.py \ test/unit/obj/test_replicator.py \
test/unit/obj/test_server.py \ test/unit/obj/test_server.py \
test/unit/obj/test_updater.py \
test/unit/proxy/controllers/test_base.py \ test/unit/proxy/controllers/test_base.py \
test/unit/proxy/controllers/test_info.py \ test/unit/proxy/controllers/test_info.py \
test/unit/proxy/controllers/test_obj.py} test/unit/proxy/controllers/test_obj.py}