openstack/swift
Code Issues Proposed changes

Merge "Corrected a number of style violations in the tests."

Browse Source
This commit is contained in:
Jenkins
2013-07-23 17:06:06 +00:00
committed by Gerrit Code Review
parent 13bbe4b7c3 0e3103c0dd
commit 1c9c4dcfab
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -160,7 +160,6 @@ class TestObjectReplicator(unittest.TestCase):
self.replicator.logger = FakeLogger() self.replicator.logger = FakeLogger()
def tearDown(self): def tearDown(self):
process_errors = []
rmtree(self.testdir, ignore_errors=1) rmtree(self.testdir, ignore_errors=1)
def test_run_once(self): def test_run_once(self):
@@ -183,7 +182,7 @@ class TestObjectReplicator(unittest.TestCase):
whole_path_from = os.path.join(self.objects, cur_part, data_dir) whole_path_from = os.path.join(self.objects, cur_part, data_dir)
process_arg_checker = [] process_arg_checker = []
nodes = [node for node in nodes = [node for node in
self.ring.get_part_nodes(int(cur_part)) \ self.ring.get_part_nodes(int(cur_part))
if node['ip'] not in _ips()] if node['ip'] not in _ips()]
for node in nodes: for node in nodes:
rsync_mod = '%s::object/sda/objects/%s' % (node['ip'], cur_part) rsync_mod = '%s::object/sda/objects/%s' % (node['ip'], cur_part)
@@ -332,7 +331,7 @@ class TestObjectReplicator(unittest.TestCase):
whole_path_from = os.path.join(self.objects, cur_part, data_dir) whole_path_from = os.path.join(self.objects, cur_part, data_dir)
process_arg_checker = [] process_arg_checker = []
nodes = [node for node in nodes = [node for node in
self.ring.get_part_nodes(int(cur_part)) \ self.ring.get_part_nodes(int(cur_part))
if node['ip'] not in _ips()] if node['ip'] not in _ips()]
for node in nodes: for node in nodes:
rsync_mod = '%s::object/sda/objects/%s' % (node['ip'], rsync_mod = '%s::object/sda/objects/%s' % (node['ip'],
@@ -396,7 +395,7 @@ class TestObjectReplicator(unittest.TestCase):
whole_path_from = os.path.join(self.objects, cur_part, data_dir) whole_path_from = os.path.join(self.objects, cur_part, data_dir)
process_arg_checker = [] process_arg_checker = []
nodes = [node for node in nodes = [node for node in
self.ring.get_part_nodes(int(cur_part)) \ self.ring.get_part_nodes(int(cur_part))
if node['ip'] not in _ips()] if node['ip'] not in _ips()]
for node in nodes: for node in nodes:
rsync_mod = '%s::object/sda/objects/%s' % (node['ip'], rsync_mod = '%s::object/sda/objects/%s' % (node['ip'],