openstack/swift
Code Issues Proposed changes

Merge "Small fixup for CooperativeRingBuilder"

Browse Source
This commit is contained in:
Jenkins 2017-07-26 13:25:33 +00:00 committed by Gerrit Code Review
commit 39f46f552e
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
test/unit/common/ring/test_composite_builder.py
View File

@ -853,6 +853,7 @@ class TestLoadComponents(BaseTestCompositeBuilder):
self.assertIn("Older builder version", error_lines[0]) self.assertIn("Older builder version", error_lines[0])
self.assertFalse(error_lines[1:]) self.assertFalse(error_lines[1:])
self.assertEqual(orig_version + 1, cb.version) self.assertEqual(orig_version + 1, cb.version)
self.assertIsNone(cb._builders)
# unless we ignore errors # unless we ignore errors
self._call_method_under_test(cb, force=True) self._call_method_under_test(cb, force=True)
self.assertEqual(old_builders[0].version, cb._builders[0].version) self.assertEqual(old_builders[0].version, cb._builders[0].version)
@ -976,12 +977,12 @@ class TestCooperativeRingBuilder(BaseTestCompositeBuilder):
{0: 256, 1: 256, 2: 256}) # sanity check {0: 256, 1: 256, 2: 256}) # sanity check
return rb return rb
def _partition_counts(self, builder, key='id'): def _partition_counts(self, builder):
""" """
Returns a dictionary mapping the given device key to (number of Returns a dictionary mapping device id's to (number of
partitions assigned to that key). partitions assigned to that device).
""" """
return Counter(builder.devs[dev_id][key] return Counter(builder.devs[dev_id]['id']
for part2dev_id in builder._replica2part2dev for part2dev_id in builder._replica2part2dev
for dev_id in part2dev_id) for dev_id in part2dev_id)
@ -1034,6 +1035,8 @@ class TestCooperativeRingBuilder(BaseTestCompositeBuilder):
self.assertEqual(192, num_moved) self.assertEqual(192, num_moved)
self.assertEqual(self._partition_counts(rb1), self.assertEqual(self._partition_counts(rb1),
{0: 192, 1: 192, 2: 192, 3: 192}) {0: 192, 1: 192, 2: 192, 3: 192})
# N.B. num_parts_can_move gathers super class's (i.e. RingBuilder)
# _can_part_move so that it doesn't refer cobuilders state.
self.assertEqual(256, num_parts_can_move(rb2)) self.assertEqual(256, num_parts_can_move(rb2))
self.assertEqual(64, num_parts_can_move(rb1)) self.assertEqual(64, num_parts_can_move(rb1))