openstack/swift
Code Issues Proposed changes

Clarify test case in common/ring/test_builder

Browse Source 
They use a bare assertRaises(ValueError, ring.RingBuilder, *,*,*), but
it's not clear which one raises which ValueError(), so I extend them to
validate the error strings as well.

Change-Id: I63280a9fc47ff678fe143e635046a0b402fd4506
This commit is contained in:
zheng yin 2016-08-29 20:21:44 +08:00 committed by Clay Gerrard
parent 0944753b37
commit f88e7fc0da
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
test/unit/common/ring/test_builder.py
View File

@ -73,16 +73,22 @@ class TestRingBuilder(unittest.TestCase):
self.assertEqual(rb.version, 0) self.assertEqual(rb.version, 0)
def test_overlarge_part_powers(self): def test_overlarge_part_powers(self):
ring.RingBuilder(32, 3, 1) # passes by not crashing expected_msg = 'part_power must be at most 32 (was 33)'
self.assertRaises(ValueError, ring.RingBuilder, 33, 3, 1) with self.assertRaises(ValueError) as ctx:
ring.RingBuilder(33, 3, 1)
self.assertEqual(str(ctx.exception), expected_msg)
def test_insufficient_replicas(self): def test_insufficient_replicas(self):
ring.RingBuilder(8, 1.0, 1) # passes by not crashing expected_msg = 'replicas must be at least 1 (was 0.999000)'
self.assertRaises(ValueError, ring.RingBuilder, 8, 0.999, 1) with self.assertRaises(ValueError) as ctx:
ring.RingBuilder(8, 0.999, 1)
self.assertEqual(str(ctx.exception), expected_msg)
def test_negative_min_part_hours(self): def test_negative_min_part_hours(self):
ring.RingBuilder(8, 3, 0) # passes by not crashing expected_msg = 'min_part_hours must be non-negative (was -1)'
self.assertRaises(ValueError, ring.RingBuilder, 8, 3, -1) with self.assertRaises(ValueError) as ctx:
ring.RingBuilder(8, 3, -1)
self.assertEqual(str(ctx.exception), expected_msg)
def test_deepcopy(self): def test_deepcopy(self):
rb = ring.RingBuilder(8, 3, 1) rb = ring.RingBuilder(8, 3, 1)