From 0e3103c0dd3690f5e69ec7953c270430d0564d12 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Mon, 22 Jul 2013 15:27:54 -0700 Subject: [PATCH] Corrected a number of style violations in the tests. Change-Id: Ib5e81ad0476c56cf84d222d67f55b8db3eb0249e --- test/unit/obj/test_replicator.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/test/unit/obj/test_replicator.py b/test/unit/obj/test_replicator.py index c4d951b7fe..dfbaf910aa 100644 --- a/test/unit/obj/test_replicator.py +++ b/test/unit/obj/test_replicator.py @@ -112,7 +112,7 @@ def _create_test_ring(path): [0, 1, 2, 3, 4, 5, 6], [1, 2, 3, 0, 5, 6, 4], [2, 3, 0, 1, 6, 4, 5], - ] + ] intended_devs = [ {'id': 0, 'device': 'sda', 'zone': 0, 'ip': '127.0.0.0', 'port': 6000}, {'id': 1, 'device': 'sda', 'zone': 1, 'ip': '127.0.0.1', 'port': 6000}, @@ -160,7 +160,6 @@ class TestObjectReplicator(unittest.TestCase): self.replicator.logger = FakeLogger() def tearDown(self): - process_errors = [] rmtree(self.testdir, ignore_errors=1) 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) process_arg_checker = [] 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()] for node in nodes: 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) process_arg_checker = [] 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()] for node in nodes: 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) process_arg_checker = [] 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()] for node in nodes: rsync_mod = '%s::object/sda/objects/%s' % (node['ip'], @@ -517,7 +516,7 @@ class TestObjectReplicator(unittest.TestCase): self.replicator.update(local_job) reqs = [] for node in local_job['nodes']: - reqs.append(mock.call(node, local_job, ['a83'])) + reqs.append(mock.call(node, local_job, ['a83'])) fake_func.assert_has_calls(reqs, any_order=True) self.assertEquals(fake_func.call_count, 2) self.assertEquals(self.replicator.replication_count, 1) @@ -530,8 +529,8 @@ class TestObjectReplicator(unittest.TestCase): # test for replication params repl_job = local_job.copy() for node in repl_job['nodes']: - node['replication_ip'] = '127.0.0.11' - node['replication_port'] = '6011' + node['replication_ip'] = '127.0.0.11' + node['replication_port'] = '6011' set_default(self) self.replicator.update(repl_job) reqs = []