test: leverage existing helper method in test_partitioner

Change-Id: Ib90ee990618cec712d7082e3c0498d92fe31946b
This commit is contained in:
Julien Danjou 2017-06-08 15:03:55 +02:00
parent 15f6de65e0
commit 361406e595
1 changed files with 5 additions and 7 deletions

View File

@ -31,13 +31,16 @@ class TestPartitioner(tests.TestWithCoordinator):
super(TestPartitioner, self).tearDown() super(TestPartitioner, self).tearDown()
def _add_members(self, number_of_members, weight=1): def _add_members(self, number_of_members, weight=1):
groups = []
for _ in six.moves.range(number_of_members): for _ in six.moves.range(number_of_members):
m = tests.get_random_uuid() m = tests.get_random_uuid()
coord = coordination.get_coordinator(self.url, m) coord = coordination.get_coordinator(self.url, m)
coord.start() coord.start()
coord.join_partitioned_group(self.group_id, weight=weight) groups.append(coord.join_partitioned_group(
self.group_id, weight=weight))
self._extra_coords.append(coord) self._extra_coords.append(coord)
self._coord.run_watchers() self._coord.run_watchers()
return groups
def _remove_members(self, number_of_members): def _remove_members(self, number_of_members):
for _ in six.moves.range(number_of_members): for _ in six.moves.range(number_of_members):
@ -63,15 +66,10 @@ class TestPartitioner(tests.TestWithCoordinator):
def test_hashring_weight(self): def test_hashring_weight(self):
p = self._coord.join_partitioned_group(self.group_id, weight=5) p = self._coord.join_partitioned_group(self.group_id, weight=5)
self.assertEqual([5], list(p.ring.nodes.values())) self.assertEqual([5], list(p.ring.nodes.values()))
coord = coordination.get_coordinator(self.url, tests.get_random_uuid()) p2 = self._add_members(1, weight=10)[0]
coord.start()
p2 = coord.join_partitioned_group(self.group_id, weight=10)
self._extra_coords.append(coord)
self._coord.run_watchers()
self.assertEqual(set([5, 10]), set(p.ring.nodes.values())) self.assertEqual(set([5, 10]), set(p.ring.nodes.values()))
self.assertEqual(set([5, 10]), set(p2.ring.nodes.values())) self.assertEqual(set([5, 10]), set(p2.ring.nodes.values()))
p.stop() p.stop()
p2.stop()
def test_stop(self): def test_stop(self):
p = self._coord.join_partitioned_group(self.group_id) p = self._coord.join_partitioned_group(self.group_id)