openstack/swift
Code Issues Proposed changes

Merge "Remove trailing slash for consistency"

Browse Source
This commit is contained in:
Jenkins 2014-01-08 02:14:50 +00:00 committed by Gerrit Code Review
commit 0d28cd2552
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
swift/common/middleware/recon.py
View File

@ -41,7 +41,7 @@ class ReconMiddleware(object):
def __init__(self, app, conf, *args, **kwargs): def __init__(self, app, conf, *args, **kwargs):
self.app = app self.app = app
self.devices = conf.get('devices', '/srv/node/') self.devices = conf.get('devices', '/srv/node')
swift_dir = conf.get('swift_dir', '/etc/swift') swift_dir = conf.get('swift_dir', '/etc/swift')
self.logger = get_logger(conf, log_route='recon') self.logger = get_logger(conf, log_route='recon')
self.recon_cache_path = conf.get('recon_cache_path', self.recon_cache_path = conf.get('recon_cache_path',

2
swift/container/server.py
View File

@ -54,7 +54,7 @@ class ContainerController(object):
def __init__(self, conf, logger=None): def __init__(self, conf, logger=None):
self.logger = logger or get_logger(conf, log_route='container-server') self.logger = logger or get_logger(conf, log_route='container-server')
self.root = conf.get('devices', '/srv/node/') self.root = conf.get('devices', '/srv/node')
self.mount_check = config_true_value(conf.get('mount_check', 'true')) self.mount_check = config_true_value(conf.get('mount_check', 'true'))
self.node_timeout = int(conf.get('node_timeout', 3)) self.node_timeout = int(conf.get('node_timeout', 3))
self.conn_timeout = float(conf.get('conn_timeout', 0.5)) self.conn_timeout = float(conf.get('conn_timeout', 0.5))

2
swift/obj/diskfile.py
View File

@ -376,7 +376,7 @@ class DiskFileManager(object):
""" """
def __init__(self, conf, logger): def __init__(self, conf, logger):
self.logger = logger self.logger = logger
self.devices = conf.get('devices', '/srv/node/') self.devices = conf.get('devices', '/srv/node')
self.disk_chunk_size = int(conf.get('disk_chunk_size', 65536)) self.disk_chunk_size = int(conf.get('disk_chunk_size', 65536))
self.keep_cache_size = int(conf.get('keep_cache_size', 5242880)) self.keep_cache_size = int(conf.get('keep_cache_size', 5242880))
self.bytes_per_sync = int(conf.get('mb_per_sync', 512)) * 1024 * 1024 self.bytes_per_sync = int(conf.get('mb_per_sync', 512)) * 1024 * 1024

10
test/unit/common/middleware/test_recon.py
View File

@ -568,7 +568,7 @@ class TestReconSuccess(TestCase):
self.mockos.ls_output = ['fakeone', 'faketwo'] self.mockos.ls_output = ['fakeone', 'faketwo']
self.mockos.ismount_output = False self.mockos.ismount_output = False
rv = self.app.get_unmounted() rv = self.app.get_unmounted()
self.assertEquals(self.mockos.listdir_calls, [(('/srv/node/',), {})]) self.assertEquals(self.mockos.listdir_calls, [(('/srv/node',), {})])
self.assertEquals(rv, unmounted_resp) self.assertEquals(rv, unmounted_resp)
def test_get_unmounted_everything_normal(self): def test_get_unmounted_everything_normal(self):
@ -576,7 +576,7 @@ class TestReconSuccess(TestCase):
self.mockos.ls_output = ['fakeone', 'faketwo'] self.mockos.ls_output = ['fakeone', 'faketwo']
self.mockos.ismount_output = True self.mockos.ismount_output = True
rv = self.app.get_unmounted() rv = self.app.get_unmounted()
self.assertEquals(self.mockos.listdir_calls, [(('/srv/node/',), {})]) self.assertEquals(self.mockos.listdir_calls, [(('/srv/node',), {})])
self.assertEquals(rv, unmounted_resp) self.assertEquals(rv, unmounted_resp)
def test_get_unmounted_checkmount_fail(self): def test_get_unmounted_checkmount_fail(self):
@ -584,7 +584,7 @@ class TestReconSuccess(TestCase):
self.mockos.ls_output = ['fakeone'] self.mockos.ls_output = ['fakeone']
self.mockos.ismount_output = OSError('brokendrive') self.mockos.ismount_output = OSError('brokendrive')
rv = self.app.get_unmounted() rv = self.app.get_unmounted()
self.assertEquals(self.mockos.listdir_calls, [(('/srv/node/',), {})]) self.assertEquals(self.mockos.listdir_calls, [(('/srv/node',), {})])
self.assertEquals(self.mockos.ismount_calls, self.assertEquals(self.mockos.ismount_calls,
[(('/srv/node/fakeone',), {})]) [(('/srv/node/fakeone',), {})])
self.assertEquals(rv, unmounted_resp) self.assertEquals(rv, unmounted_resp)
@ -598,7 +598,7 @@ class TestReconSuccess(TestCase):
self.mockos.ls_output = [] self.mockos.ls_output = []
self.mockos.ismount_output = False self.mockos.ismount_output = False
rv = self.app.get_unmounted() rv = self.app.get_unmounted()
self.assertEquals(self.mockos.listdir_calls, [(('/srv/node/',), {})]) self.assertEquals(self.mockos.listdir_calls, [(('/srv/node',), {})])
self.assertEquals(rv, unmounted_resp) self.assertEquals(rv, unmounted_resp)
def test_get_diskusage(self): def test_get_diskusage(self):
@ -625,7 +625,7 @@ class TestReconSuccess(TestCase):
self.mockos.ls_output = ['canhazdrive1'] self.mockos.ls_output = ['canhazdrive1']
self.mockos.ismount_output = OSError('brokendrive') self.mockos.ismount_output = OSError('brokendrive')
rv = self.app.get_diskusage() rv = self.app.get_diskusage()
self.assertEquals(self.mockos.listdir_calls, [(('/srv/node/',), {})]) self.assertEquals(self.mockos.listdir_calls, [(('/srv/node',), {})])
self.assertEquals(self.mockos.ismount_calls, self.assertEquals(self.mockos.ismount_calls,
[(('/srv/node/canhazdrive1',), {})]) [(('/srv/node/canhazdrive1',), {})])
self.assertEquals(rv, du_resp) self.assertEquals(rv, du_resp)