openstack/swift
Code Issues Proposed changes

py3: everything account except the real things

Browse Source 
The the 80% of the work still remain in server and replicator,
but let's knock this out.

Change-Id: I1e1dee8f8c77212183b0ef2b574b57ad1051d57e
This commit is contained in:
Pete Zaitcev 2018-10-04 17:55:03 -05:00
parent ab2abfe3ae
commit 6676d74f8f
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
swift/account/reaper.py
View File

@ -270,7 +270,11 @@ class AccountReaper(Daemon):
break break
try: try:
for (container, _junk, _junk, _junk, _junk) in containers: for (container, _junk, _junk, _junk, _junk) in containers:
this_shard = int(md5(container).hexdigest(), 16) % \ if six.PY3:
container_ = container.encode('utf-8')
else:
container_ = container
this_shard = int(md5(container_).hexdigest(), 16) % \
len(nodes) len(nodes)
if container_shard not in (this_shard, None): if container_shard not in (this_shard, None):
continue continue
@ -393,10 +397,11 @@ class AccountReaper(Daemon):
self.logger.error('ERROR: invalid storage policy index: %r' self.logger.error('ERROR: invalid storage policy index: %r'
% policy_index) % policy_index)
for obj in objects: for obj in objects:
if isinstance(obj['name'], six.text_type): obj_name = obj['name']
obj['name'] = obj['name'].encode('utf8') if isinstance(obj_name, six.text_type):
obj_name = obj_name.encode('utf8')
pool.spawn(self.reap_object, account, container, part, pool.spawn(self.reap_object, account, container, part,
nodes, obj['name'], policy_index) nodes, obj_name, policy_index)
pool.waitall() pool.waitall()
except (Exception, Timeout): except (Exception, Timeout):
self.logger.exception(_('Exception with objects for container ' self.logger.exception(_('Exception with objects for container '

6
test/unit/account/test_reaper.py
View File

@ -841,12 +841,10 @@ class TestReaper(unittest.TestCase):
r = init_reaper() r = init_reaper()
with patch('swift.account.reaper.sleep', fake_sleep): with patch('swift.account.reaper.sleep', fake_sleep):
with patch('swift.account.reaper.random.random', fake_random): with patch('swift.account.reaper.random.random', fake_random):
try: with self.assertRaises(Exception) as raised:
r.run_forever() r.run_forever()
except Exception as err:
pass
self.assertEqual(self.val, 1) self.assertEqual(self.val, 1)
self.assertEqual(str(err), 'exit') self.assertEqual(str(raised.exception), 'exit')
if __name__ == '__main__': if __name__ == '__main__':

2
tox.ini
View File

@ -29,7 +29,9 @@ setenv = VIRTUAL_ENV={envdir}
[testenv:py35] [testenv:py35]
commands = commands =
nosetests {posargs:\ nosetests {posargs:\
test/unit/account/test_auditor.py \
test/unit/account/test_backend.py \ test/unit/account/test_backend.py \
test/unit/account/test_reaper.py \
test/unit/account/test_utils.py \ test/unit/account/test_utils.py \
test/unit/cli/test_dispersion_report.py \ test/unit/cli/test_dispersion_report.py \
test/unit/cli/test_form_signature.py \ test/unit/cli/test_form_signature.py \