summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2021-02-26 07:10:09 +0000
committerGerrit Code Review <review@openstack.org>2021-02-26 07:10:09 +0000
commite2f5249271dad3a9f11e37e0285e3e162bd2f137 (patch)
tree010305f680b9f15193be3f493bdd6b9874899b81
parent0c2cc63b59ea9f0a831439f149b380eee7e26d36 (diff)
parentc9f6e760bc2b70e025edb149417862ce77689646 (diff)
downloadswift-e2f5249271dad3a9f11e37e0285e3e162bd2f137.tar.gz
Merge "Add unit test coverage for CleavingContext.done()"
-rw-r--r--test/unit/container/test_sharder.py29
1 files changed, 29 insertions, 0 deletions
diff --git a/test/unit/container/test_sharder.py b/test/unit/container/test_sharder.py
index 5dadc6fa6..b7cd4e2a1 100644
--- a/test/unit/container/test_sharder.py
+++ b/test/unit/container/test_sharder.py
@@ -942,6 +942,7 @@ class TestSharder(BaseTestSharder):
context = CleavingContext.load(broker)
self.assertTrue(context.misplaced_done)
self.assertFalse(context.cleaving_done)
+ self.assertFalse(context.done())
self.assertEqual('', context.cursor)
self.assertEqual(9, context.cleave_to_row)
self.assertEqual(9, context.max_row)
@@ -964,6 +965,7 @@ class TestSharder(BaseTestSharder):
context = CleavingContext.load(broker)
self.assertTrue(context.misplaced_done)
self.assertFalse(context.cleaving_done)
+ self.assertFalse(context.done())
self.assertEqual('', context.cursor)
self.assertEqual(9, context.cleave_to_row)
self.assertEqual(9, context.max_row)
@@ -1021,6 +1023,7 @@ class TestSharder(BaseTestSharder):
context = CleavingContext.load(broker)
self.assertTrue(context.misplaced_done)
self.assertFalse(context.cleaving_done)
+ self.assertFalse(context.done())
self.assertEqual('here', context.cursor)
self.assertEqual(9, context.cleave_to_row)
self.assertEqual(9, context.max_row)
@@ -1057,6 +1060,7 @@ class TestSharder(BaseTestSharder):
context = CleavingContext.load(broker)
self.assertTrue(context.misplaced_done)
self.assertFalse(context.cleaving_done)
+ self.assertFalse(context.done())
self.assertEqual('here', context.cursor)
self.assertEqual(9, context.cleave_to_row)
self.assertEqual(9, context.max_row)
@@ -1121,6 +1125,7 @@ class TestSharder(BaseTestSharder):
context = CleavingContext.load(broker)
self.assertTrue(context.misplaced_done)
self.assertFalse(context.cleaving_done)
+ self.assertFalse(context.done())
self.assertEqual('where', context.cursor)
self.assertEqual(9, context.cleave_to_row)
self.assertEqual(9, context.max_row)
@@ -1176,6 +1181,7 @@ class TestSharder(BaseTestSharder):
context = CleavingContext.load(broker)
self.assertTrue(context.misplaced_done)
self.assertFalse(context.cleaving_done)
+ self.assertFalse(context.done())
self.assertEqual('yonder', context.cursor)
self.assertEqual(9, context.cleave_to_row)
self.assertEqual(9, context.max_row)
@@ -1240,6 +1246,7 @@ class TestSharder(BaseTestSharder):
context = CleavingContext.load(broker)
self.assertTrue(context.misplaced_done)
self.assertTrue(context.cleaving_done)
+ self.assertTrue(context.done())
self.assertEqual('', context.cursor)
self.assertEqual(9, context.cleave_to_row)
self.assertEqual(9, context.max_row)
@@ -1302,6 +1309,7 @@ class TestSharder(BaseTestSharder):
context = CleavingContext.load(broker)
self.assertTrue(context.misplaced_done)
self.assertFalse(context.cleaving_done)
+ self.assertFalse(context.done())
self.assertEqual(shard_ranges[1].upper_str, context.cursor)
self.assertEqual(8, context.cleave_to_row)
self.assertEqual(8, context.max_row)
@@ -1335,6 +1343,7 @@ class TestSharder(BaseTestSharder):
context = CleavingContext.load(broker)
self.assertTrue(context.misplaced_done)
self.assertFalse(context.cleaving_done)
+ self.assertFalse(context.done())
self.assertEqual(shard_ranges[1].upper_str, context.cursor)
self.assertEqual(8, context.cleave_to_row)
self.assertEqual(8, context.max_row)
@@ -1367,6 +1376,7 @@ class TestSharder(BaseTestSharder):
context = CleavingContext.load(broker)
self.assertTrue(context.misplaced_done)
self.assertTrue(context.cleaving_done)
+ self.assertTrue(context.done())
self.assertEqual(shard_ranges[2].upper_str, context.cursor)
self.assertEqual(8, context.cleave_to_row)
self.assertEqual(8, context.max_row)
@@ -1704,6 +1714,7 @@ class TestSharder(BaseTestSharder):
context = CleavingContext.load(broker)
self.assertFalse(context.misplaced_done)
self.assertFalse(context.cleaving_done)
+ self.assertFalse(context.done())
self.assertEqual('', context.cursor)
self.assertEqual(10, context.cleave_to_row)
self.assertEqual(12, context.max_row) # note that max row increased
@@ -6126,6 +6137,24 @@ class TestCleavingContext(BaseTestSharder):
self.assertEqual(8, ctx.ranges_todo)
self.assertEqual('c', ctx.cursor)
+ def test_done(self):
+ ctx = CleavingContext(
+ 'test', '', max_row=12, cleave_to_row=12, last_cleave_to_row=2,
+ cleaving_done=True, misplaced_done=True)
+ self.assertTrue(ctx.done())
+ ctx = CleavingContext(
+ 'test', '', max_row=12, cleave_to_row=11, last_cleave_to_row=2,
+ cleaving_done=True, misplaced_done=True)
+ self.assertFalse(ctx.done())
+ ctx = CleavingContext(
+ 'test', '', max_row=12, cleave_to_row=12, last_cleave_to_row=2,
+ cleaving_done=True, misplaced_done=False)
+ self.assertFalse(ctx.done())
+ ctx = CleavingContext(
+ 'test', '', max_row=12, cleave_to_row=12, last_cleave_to_row=2,
+ cleaving_done=False, misplaced_done=True)
+ self.assertFalse(ctx.done())
+
class TestSharderFunctions(BaseTestSharder):
def test_find_shrinking_candidates(self):