openstack/swift
Code Issues Proposed changes

Merge "Use more specific asserts in test/unit/common/ring"

Browse Source
This commit is contained in:
Jenkins 2016-07-20 20:30:57 +00:00 committed by Gerrit Code Review
commit 02e046fdb6
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,7 +69,7 @@ class TestRingBuilder(unittest.TestCase):
self.assertEqual(rb.min_part_hours, 1) self.assertEqual(rb.min_part_hours, 1)
self.assertEqual(rb.parts, 2 ** 8) self.assertEqual(rb.parts, 2 ** 8)
self.assertEqual(rb.devs, []) self.assertEqual(rb.devs, [])
self.assertEqual(rb.devs_changed, False) self.assertFalse(rb.devs_changed)
self.assertEqual(rb.version, 0) self.assertEqual(rb.version, 0)
def test_overlarge_part_powers(self): def test_overlarge_part_powers(self):
@ -110,11 +110,11 @@ class TestRingBuilder(unittest.TestCase):
rb_copy = copy.deepcopy(rb) rb_copy = copy.deepcopy(rb)
self.assertEqual(rb.to_dict(), rb_copy.to_dict()) self.assertEqual(rb.to_dict(), rb_copy.to_dict())
self.assertTrue(rb.devs is not rb_copy.devs) self.assertIsNot(rb.devs, rb_copy.devs)
self.assertTrue(rb._replica2part2dev is not rb_copy._replica2part2dev) self.assertIsNot(rb._replica2part2dev, rb_copy._replica2part2dev)
self.assertTrue(rb._last_part_moves is not rb_copy._last_part_moves) self.assertIsNot(rb._last_part_moves, rb_copy._last_part_moves)
self.assertTrue(rb._remove_devs is not rb_copy._remove_devs) self.assertIsNot(rb._remove_devs, rb_copy._remove_devs)
self.assertTrue(rb._dispersion_graph is not rb_copy._dispersion_graph) self.assertIsNot(rb._dispersion_graph, rb_copy._dispersion_graph)
def test_get_ring(self): def test_get_ring(self):
rb = ring.RingBuilder(8, 3, 1) rb = ring.RingBuilder(8, 3, 1)
@ -129,14 +129,14 @@ class TestRingBuilder(unittest.TestCase):
rb.remove_dev(1) rb.remove_dev(1)
rb.rebalance() rb.rebalance()
r = rb.get_ring() r = rb.get_ring()
self.assertTrue(isinstance(r, ring.RingData)) self.assertIsInstance(r, ring.RingData)
r2 = rb.get_ring() r2 = rb.get_ring()
self.assertTrue(r is r2) self.assertIs(r, r2)
rb.rebalance() rb.rebalance()
r3 = rb.get_ring() r3 = rb.get_ring()
self.assertTrue(r3 is not r2) self.assertIsNot(r3, r2)
r4 = rb.get_ring() r4 = rb.get_ring()
self.assertTrue(r3 is r4) self.assertIs(r3, r4)
def test_rebalance_with_seed(self): def test_rebalance_with_seed(self):
devs = [(0, 10000), (1, 10001), (2, 10002), (1, 10003)] devs = [(0, 10000), (1, 10001), (2, 10002), (1, 10003)]
@ -157,7 +157,7 @@ class TestRingBuilder(unittest.TestCase):
rb2 = ring_builders[2] rb2 = ring_builders[2]
r0 = rb0.get_ring() r0 = rb0.get_ring()
self.assertTrue(rb0.get_ring() is r0) self.assertIs(rb0.get_ring(), r0)
rb0.rebalance() # NO SEED rb0.rebalance() # NO SEED
rb1.rebalance(seed=10) rb1.rebalance(seed=10)
@ -166,7 +166,7 @@ class TestRingBuilder(unittest.TestCase):
r1 = rb1.get_ring() r1 = rb1.get_ring()
r2 = rb2.get_ring() r2 = rb2.get_ring()
self.assertFalse(rb0.get_ring() is r0) self.assertIsNot(rb0.get_ring(), r0)
self.assertNotEqual(r0.to_dict(), r1.to_dict()) self.assertNotEqual(r0.to_dict(), r1.to_dict())
self.assertEqual(r1.to_dict(), r2.to_dict()) self.assertEqual(r1.to_dict(), r2.to_dict())
@ -391,7 +391,7 @@ class TestRingBuilder(unittest.TestCase):
_, balance, _ = rb.rebalance(seed=2) _, balance, _ = rb.rebalance(seed=2)
# maybe not *perfect*, but should be close # maybe not *perfect*, but should be close
self.assertTrue(balance <= 1) self.assertLessEqual(balance, 1)
def test_multitier_partial(self): def test_multitier_partial(self):
# Multitier test, nothing full # Multitier test, nothing full
@ -2063,8 +2063,8 @@ class TestRingBuilder(unittest.TestCase):
self.assertEqual(counts, {0: 128, 1: 128, 2: 256, 3: 256}) self.assertEqual(counts, {0: 128, 1: 128, 2: 256, 3: 256})
dev_usage, worst = rb.validate() dev_usage, worst = rb.validate()
self.assertTrue(dev_usage is None) self.assertIsNone(dev_usage)
self.assertTrue(worst is None) self.assertIsNone(worst)
dev_usage, worst = rb.validate(stats=True) dev_usage, worst = rb.validate(stats=True)
self.assertEqual(list(dev_usage), [32, 32, 64, 64, self.assertEqual(list(dev_usage), [32, 32, 64, 64,
@ -2394,7 +2394,7 @@ class TestRingBuilder(unittest.TestCase):
new_dev_id = rb.add_dev({'region': 0, 'zone': 0, 'ip': '127.0.0.1', new_dev_id = rb.add_dev({'region': 0, 'zone': 0, 'ip': '127.0.0.1',
'port': 6200, 'weight': 1.0, 'port': 6200, 'weight': 1.0,
'device': 'sda'}) 'device': 'sda'})
self.assertTrue(new_dev_id < add_dev_count) self.assertLess(new_dev_id, add_dev_count)
# try with non-contiguous holes # try with non-contiguous holes
# [0, 1, None, 3, 4, None] # [0, 1, None, 3, 4, None]
@ -2494,7 +2494,7 @@ class TestRingBuilder(unittest.TestCase):
# Due to the increased partition power, the partition each object # Due to the increased partition power, the partition each object
# is assigned to has changed. If the old partition was X, it will # is assigned to has changed. If the old partition was X, it will
# now be either located in 2*X or 2*X+1 # now be either located in 2*X or 2*X+1
self.assertTrue(new_part in [old_part * 2, old_part * 2 + 1]) self.assertIn(new_part, [old_part * 2, old_part * 2 + 1])
# Importantly, we expect the objects to be placed on the same # Importantly, we expect the objects to be placed on the same
# nodes after increasing the partition power # nodes after increasing the partition power

4
test/unit/common/ring/test_ring.py
View File

@ -198,9 +198,9 @@ class TestRing(TestRingBase):
utils.SWIFT_CONF_FILE = _orig_swift_conf_file utils.SWIFT_CONF_FILE = _orig_swift_conf_file
def test_has_changed(self): def test_has_changed(self):
self.assertEqual(self.ring.has_changed(), False) self.assertFalse(self.ring.has_changed())
os.utime(self.testgz, (time() + 60, time() + 60)) os.utime(self.testgz, (time() + 60, time() + 60))
self.assertEqual(self.ring.has_changed(), True) self.assertTrue(self.ring.has_changed())
def test_reload(self): def test_reload(self):
os.utime(self.testgz, (time() - 300, time() - 300)) os.utime(self.testgz, (time() - 300, time() - 300))