summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-29 11:35:07 +0000
committerGerrit Code Review <review@openstack.org>2017-06-29 11:35:07 +0000
commite6274bdd5b36f7b114e255c258659223ba921773 (patch)
tree8b0050484b69c71fa06ec197587b8781c1d5974d
parentfd08ee972c5cbcb1b49dcb3c973fb0075d495b0e (diff)
parent361406e595aacb070151d7bd1a8aa72d3e65ce45 (diff)
downloadtooz-e6274bdd5b36f7b114e255c258659223ba921773.tar.gz
Merge "test: leverage existing helper method in test_partitioner"1.57.3
-rw-r--r--tooz/tests/test_partitioner.py12
1 files changed, 5 insertions, 7 deletions
diff --git a/tooz/tests/test_partitioner.py b/tooz/tests/test_partitioner.py
index 64bfe1b..10fa6b9 100644
--- a/tooz/tests/test_partitioner.py
+++ b/tooz/tests/test_partitioner.py
@@ -31,13 +31,16 @@ class TestPartitioner(tests.TestWithCoordinator):
super(TestPartitioner, self).tearDown()
def _add_members(self, number_of_members, weight=1):
+ groups = []
for _ in six.moves.range(number_of_members):
m = tests.get_random_uuid()
coord = coordination.get_coordinator(self.url, m)
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._coord.run_watchers()
+ return groups
def _remove_members(self, number_of_members):
for _ in six.moves.range(number_of_members):
@@ -63,15 +66,10 @@ class TestPartitioner(tests.TestWithCoordinator):
def test_hashring_weight(self):
p = self._coord.join_partitioned_group(self.group_id, weight=5)
self.assertEqual([5], list(p.ring.nodes.values()))
- coord = coordination.get_coordinator(self.url, tests.get_random_uuid())
- coord.start()
- p2 = coord.join_partitioned_group(self.group_id, weight=10)
- self._extra_coords.append(coord)
- self._coord.run_watchers()
+ p2 = self._add_members(1, weight=10)[0]
self.assertEqual(set([5, 10]), set(p.ring.nodes.values()))
self.assertEqual(set([5, 10]), set(p2.ring.nodes.values()))
p.stop()
- p2.stop()
def test_stop(self):
p = self._coord.join_partitioned_group(self.group_id)