openstack/swift
Code Issues Proposed changes

Clean up HASH_PATH_* patching

Browse Source 
Previously, we'd sometimes shove strings into HASH_PATH_PREFIX or
HASH_PATH_SUFFIX, which would blow up on py3. Now, always use bytes.

Change-Id: Icab9981e8920da505c2395eb040f8261f2da6d2e
This commit is contained in:
Tim Burke 2018-11-01 17:49:35 +00:00
parent a13e44b39d
commit 3420921a33
12 changed files with 27 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/unit/common/test_daemon.py
View File

@ -109,8 +109,8 @@ class TestRunDaemon(unittest.TestCase):
def setUp(self): def setUp(self):
for patcher in [ for patcher in [
mock.patch.object(utils, 'HASH_PATH_PREFIX', 'startcap'), mock.patch.object(utils, 'HASH_PATH_PREFIX', b'startcap'),
mock.patch.object(utils, 'HASH_PATH_SUFFIX', 'endcap'), mock.patch.object(utils, 'HASH_PATH_SUFFIX', b'endcap'),
mock.patch.object(utils, 'drop_privileges', lambda *args: None), mock.patch.object(utils, 'drop_privileges', lambda *args: None),
mock.patch.object(utils, 'capture_stdio', lambda *args: None), mock.patch.object(utils, 'capture_stdio', lambda *args: None),
]: ]:

2
test/unit/common/test_internal_client.py
View File

@ -226,7 +226,7 @@ class TestCompressingfileReader(unittest.TestCase):
class TestInternalClient(unittest.TestCase): class TestInternalClient(unittest.TestCase):
@mock.patch('swift.common.utils.HASH_PATH_SUFFIX', new='endcap') @mock.patch('swift.common.utils.HASH_PATH_SUFFIX', new=b'endcap')
@with_tempdir @with_tempdir
def test_load_from_config(self, tempdir): def test_load_from_config(self, tempdir):
conf_path = os.path.join(tempdir, 'interal_client.conf') conf_path = os.path.join(tempdir, 'interal_client.conf')

2
test/unit/common/test_wsgi.py
View File

@ -70,7 +70,6 @@ class TestWSGI(unittest.TestCase):
"""Tests for swift.common.wsgi""" """Tests for swift.common.wsgi"""
def setUp(self): def setUp(self):
utils.HASH_PATH_PREFIX = 'startcap'
if six.PY2: if six.PY2:
self._orig_parsetype = mimetools.Message.parsetype self._orig_parsetype = mimetools.Message.parsetype
@ -1818,7 +1817,6 @@ class TestPipelineWrapper(unittest.TestCase):
@patch_policies @patch_policies
@mock.patch('swift.common.utils.HASH_PATH_SUFFIX', new='endcap')
class TestPipelineModification(unittest.TestCase): class TestPipelineModification(unittest.TestCase):
def pipeline_modules(self, app): def pipeline_modules(self, app):
# This is rather brittle; it'll break if a middleware stores its app # This is rather brittle; it'll break if a middleware stores its app

4
test/unit/container/test_sync.py
View File

@ -31,8 +31,8 @@ from swift.common.storage_policy import StoragePolicy
import test import test
from test.unit import patch_policies, with_tempdir from test.unit import patch_policies, with_tempdir
utils.HASH_PATH_SUFFIX = 'endcap' utils.HASH_PATH_SUFFIX = b'endcap'
utils.HASH_PATH_PREFIX = 'endcap' utils.HASH_PATH_PREFIX = b'endcap'
class FakeRing(object): class FakeRing(object):

4
test/unit/container/test_updater.py
View File

@ -37,8 +37,8 @@ from test import listen_zero
class TestContainerUpdater(unittest.TestCase): class TestContainerUpdater(unittest.TestCase):
def setUp(self): def setUp(self):
utils.HASH_PATH_SUFFIX = 'endcap' utils.HASH_PATH_SUFFIX = b'endcap'
utils.HASH_PATH_PREFIX = 'startcap' utils.HASH_PATH_PREFIX = b'startcap'
self.testdir = os.path.join(mkdtemp(), 'tmp_test_container_updater') self.testdir = os.path.join(mkdtemp(), 'tmp_test_container_updater')
rmtree(self.testdir, ignore_errors=1) rmtree(self.testdir, ignore_errors=1)
os.mkdir(self.testdir) os.mkdir(self.testdir)

4
test/unit/obj/test_diskfile.py
View File

@ -147,8 +147,8 @@ class TestDiskFileModuleMethods(unittest.TestCase):
def setUp(self): def setUp(self):
skip_if_no_xattrs() skip_if_no_xattrs()
utils.HASH_PATH_SUFFIX = 'endcap' utils.HASH_PATH_SUFFIX = b'endcap'
utils.HASH_PATH_PREFIX = '' utils.HASH_PATH_PREFIX = b''
# Setup a test ring per policy (stolen from common/test_ring.py) # Setup a test ring per policy (stolen from common/test_ring.py)
self.testdir = tempfile.mkdtemp() self.testdir = tempfile.mkdtemp()
self.devices = os.path.join(self.testdir, 'node') self.devices = os.path.join(self.testdir, 'node')

4
test/unit/obj/test_reconstructor.py
View File

@ -154,8 +154,8 @@ class TestGlobalSetupObjectReconstructor(unittest.TestCase):
_create_test_rings(self.testdir) _create_test_rings(self.testdir)
POLICIES[0].object_ring = ring.Ring(self.testdir, ring_name='object') POLICIES[0].object_ring = ring.Ring(self.testdir, ring_name='object')
POLICIES[1].object_ring = ring.Ring(self.testdir, ring_name='object-1') POLICIES[1].object_ring = ring.Ring(self.testdir, ring_name='object-1')
utils.HASH_PATH_SUFFIX = 'endcap' utils.HASH_PATH_SUFFIX = b'endcap'
utils.HASH_PATH_PREFIX = '' utils.HASH_PATH_PREFIX = b''
self.devices = os.path.join(self.testdir, 'node') self.devices = os.path.join(self.testdir, 'node')
os.makedirs(self.devices) os.makedirs(self.devices)
os.mkdir(os.path.join(self.devices, 'sda1')) os.mkdir(os.path.join(self.devices, 'sda1'))

4
test/unit/obj/test_replicator.py
View File

@ -224,8 +224,8 @@ class TestObjectReplicator(unittest.TestCase):
def setUp(self): def setUp(self):
skip_if_no_xattrs() skip_if_no_xattrs()
utils.HASH_PATH_SUFFIX = 'endcap' utils.HASH_PATH_SUFFIX = b'endcap'
utils.HASH_PATH_PREFIX = '' utils.HASH_PATH_PREFIX = b''
# recon cache path # recon cache path
self.recon_cache = tempfile.mkdtemp() self.recon_cache = tempfile.mkdtemp()
rmtree(self.recon_cache, ignore_errors=1) rmtree(self.recon_cache, ignore_errors=1)

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

@ -139,8 +139,8 @@ class TestObjectController(unittest.TestCase):
def setUp(self): def setUp(self):
"""Set up for testing swift.object.server.ObjectController""" """Set up for testing swift.object.server.ObjectController"""
skip_if_no_xattrs() skip_if_no_xattrs()
utils.HASH_PATH_SUFFIX = 'endcap' utils.HASH_PATH_SUFFIX = b'endcap'
utils.HASH_PATH_PREFIX = 'startcap' utils.HASH_PATH_PREFIX = b'startcap'
self.tmpdir = mkdtemp() self.tmpdir = mkdtemp()
self.testdir = os.path.join(self.tmpdir, self.testdir = os.path.join(self.tmpdir,
'tmp_test_object_server_ObjectController') 'tmp_test_object_server_ObjectController')
@ -958,7 +958,7 @@ class TestObjectController(unittest.TestCase):
headers=put_headers, body='test') headers=put_headers, body='test')
with mock.patch('swift.obj.server.http_connect', fake_http_connect), \ with mock.patch('swift.obj.server.http_connect', fake_http_connect), \
mock.patch('swift.common.utils.HASH_PATH_PREFIX', ''), \ mock.patch('swift.common.utils.HASH_PATH_PREFIX', b''), \
fake_spawn(): fake_spawn():
resp = req.get_response(self.object_controller) resp = req.get_response(self.object_controller)
@ -1002,7 +1002,7 @@ class TestObjectController(unittest.TestCase):
headers=post_headers) headers=post_headers)
with mock.patch('swift.obj.server.http_connect', fake_http_connect), \ with mock.patch('swift.obj.server.http_connect', fake_http_connect), \
mock.patch('swift.common.utils.HASH_PATH_PREFIX', ''), \ mock.patch('swift.common.utils.HASH_PATH_PREFIX', b''), \
fake_spawn(): fake_spawn():
resp = req.get_response(self.object_controller) resp = req.get_response(self.object_controller)
@ -1112,7 +1112,7 @@ class TestObjectController(unittest.TestCase):
'X-Backend-Redirect-Timestamp': next(self.ts).internal} 'X-Backend-Redirect-Timestamp': next(self.ts).internal}
with mocked_http_conn(301, headers=[resp_headers]) as conn, \ with mocked_http_conn(301, headers=[resp_headers]) as conn, \
mock.patch('swift.common.utils.HASH_PATH_PREFIX', ''),\ mock.patch('swift.common.utils.HASH_PATH_PREFIX', b''),\
fake_spawn(): fake_spawn():
resp = req.get_response(self.object_controller) resp = req.get_response(self.object_controller)
@ -5088,7 +5088,7 @@ class TestObjectController(unittest.TestCase):
policy = random.choice(list(POLICIES)) policy = random.choice(list(POLICIES))
self._stage_tmp_dir(policy) self._stage_tmp_dir(policy)
_prefix = utils.HASH_PATH_PREFIX _prefix = utils.HASH_PATH_PREFIX
utils.HASH_PATH_PREFIX = '' utils.HASH_PATH_PREFIX = b''
def fake_http_connect(*args): def fake_http_connect(*args):
raise Exception('test') raise Exception('test')
@ -5119,7 +5119,7 @@ class TestObjectController(unittest.TestCase):
policy = random.choice(list(POLICIES)) policy = random.choice(list(POLICIES))
self._stage_tmp_dir(policy) self._stage_tmp_dir(policy)
_prefix = utils.HASH_PATH_PREFIX _prefix = utils.HASH_PATH_PREFIX
utils.HASH_PATH_PREFIX = '' utils.HASH_PATH_PREFIX = b''
def fake_http_connect(status): def fake_http_connect(status):
@ -5164,7 +5164,7 @@ class TestObjectController(unittest.TestCase):
def test_async_update_does_not_save_on_2xx(self): def test_async_update_does_not_save_on_2xx(self):
_prefix = utils.HASH_PATH_PREFIX _prefix = utils.HASH_PATH_PREFIX
utils.HASH_PATH_PREFIX = '' utils.HASH_PATH_PREFIX = b''
def fake_http_connect(status): def fake_http_connect(status):
@ -5200,7 +5200,7 @@ class TestObjectController(unittest.TestCase):
policy = random.choice(list(POLICIES)) policy = random.choice(list(POLICIES))
self._stage_tmp_dir(policy) self._stage_tmp_dir(policy)
_prefix = utils.HASH_PATH_PREFIX _prefix = utils.HASH_PATH_PREFIX
utils.HASH_PATH_PREFIX = '' utils.HASH_PATH_PREFIX = b''
def fake_http_connect(): def fake_http_connect():

4
test/unit/obj/test_ssync_receiver.py
View File

@ -44,8 +44,8 @@ class TestReceiver(unittest.TestCase):
def setUp(self): def setUp(self):
skip_if_no_xattrs() skip_if_no_xattrs()
utils.HASH_PATH_SUFFIX = 'endcap' utils.HASH_PATH_SUFFIX = b'endcap'
utils.HASH_PATH_PREFIX = 'startcap' utils.HASH_PATH_PREFIX = b'startcap'
# Not sure why the test.unit stuff isn't taking effect here; so I'm # Not sure why the test.unit stuff isn't taking effect here; so I'm
# reinforcing it. # reinforcing it.
self.testdir = os.path.join( self.testdir = os.path.join(

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

@ -68,8 +68,8 @@ _mocked_policies = [StoragePolicy(0, 'zero', False),
class TestObjectUpdater(unittest.TestCase): class TestObjectUpdater(unittest.TestCase):
def setUp(self): def setUp(self):
utils.HASH_PATH_SUFFIX = 'endcap' utils.HASH_PATH_SUFFIX = b'endcap'
utils.HASH_PATH_PREFIX = '' utils.HASH_PATH_PREFIX = b''
self.testdir = mkdtemp() self.testdir = mkdtemp()
ring_file = os.path.join(self.testdir, 'container.ring.gz') ring_file = os.path.join(self.testdir, 'container.ring.gz')
with closing(GzipFile(ring_file, 'wb')) as f: with closing(GzipFile(ring_file, 'wb')) as f:

2
test/unit/proxy/test_server.py
View File

@ -1223,7 +1223,7 @@ class TestProxyServerLoading(unittest.TestCase):
def setUp(self): def setUp(self):
self._orig_hash_suffix = utils.HASH_PATH_SUFFIX self._orig_hash_suffix = utils.HASH_PATH_SUFFIX
utils.HASH_PATH_SUFFIX = 'endcap' utils.HASH_PATH_SUFFIX = b'endcap'
self.tempdir = mkdtemp() self.tempdir = mkdtemp()
def tearDown(self): def tearDown(self):