|
14 | 14 | TEST_DURATION=10
|
15 | 15 | TEST_RECOVERY_TIME=20
|
16 | 16 |
|
17 |
| -classRecoveryTest(unittest.TestCase): |
| 17 | +classTestHelper(object): |
| 18 | + |
| 19 | +defassertIsolation(self,aggs): |
| 20 | +isolated=True |
| 21 | +forconn_id,agginenumerate(aggs): |
| 22 | +isolated=isolatedandagg['sumtotal']['isolation']==0 |
| 23 | +ifnotisolated: |
| 24 | +raiseAssertionError('Isolation failure') |
| 25 | + |
| 26 | +defassertCommits(self,aggs): |
| 27 | +commits=True |
| 28 | +forconn_id,agginenumerate(aggs): |
| 29 | +commits=commitsand'commit'inagg['transfer']['finish'] |
| 30 | +ifnotcommits: |
| 31 | +raiseAssertionError('No commits during aggregation interval') |
| 32 | + |
| 33 | +defassertNoCommits(self,aggs): |
| 34 | +commits=True |
| 35 | +forconn_id,agginenumerate(aggs): |
| 36 | +commits=commitsand'commit'inagg['transfer']['finish'] |
| 37 | +ifcommits: |
| 38 | +raiseAssertionError('There are commits during aggregation interval') |
| 39 | + |
| 40 | +defperformFailure(self,failure): |
| 41 | +failure.start() |
| 42 | + |
| 43 | +self.client.clean_aggregates() |
| 44 | +time.sleep(TEST_DURATION) |
| 45 | +aggs_failure=self.client.get_aggregates() |
| 46 | + |
| 47 | +failure.stop() |
| 48 | + |
| 49 | +self.client.clean_aggregates() |
| 50 | +time.sleep(TEST_RECOVERY_TIME) |
| 51 | +aggs=self.client.get_aggregates() |
| 52 | + |
| 53 | +return (aggs_failure,aggs) |
| 54 | + |
| 55 | + |
| 56 | +classRecoveryTest(unittest.TestCase,TestHelper): |
| 57 | + |
18 | 58 | @classmethod
|
19 | 59 | defsetUpClass(self):
|
20 | 60 | # subprocess.check_call(['docker-compose','up',
|
@@ -58,32 +98,14 @@ def test_normal_operations(self):
|
58 | 98 | deftest_node_partition(self):
|
59 | 99 | print('### nodePartitionTest ###')
|
60 | 100 |
|
61 |
| -failure=SingleNodePartition('node3') |
62 |
| -failure.start() |
63 |
| - |
64 |
| -self.client.clean_aggregates() |
65 |
| -time.sleep(TEST_DURATION) |
66 |
| -aggs_failure=self.client.get_aggregates() |
67 |
| - |
68 |
| -failure.stop() |
| 101 | +aggs_failure,aggs=self.performFailure(SingleNodePartition('node3')) |
69 | 102 |
|
70 |
| -self.client.clean_aggregates() |
71 |
| -time.sleep(TEST_RECOVERY_TIME) |
72 |
| -aggs=self.client.get_aggregates() |
| 103 | +self.assertCommits(aggs_failure[:2]) |
| 104 | +self.assertNoCommits(aggs_failure[2:]) |
| 105 | +self.assertIsolation(aggs_failure) |
73 | 106 |
|
74 |
| -self.assertTrue('commit'inaggs_failure[0]['transfer']['finish'] ) |
75 |
| -self.assertTrue('commit'inaggs_failure[1]['transfer']['finish'] ) |
76 |
| -self.assertTrue('commit'notinaggs_failure[2]['transfer']['finish'] ) |
77 |
| -self.assertTrue(aggs_failure[0]['sumtotal']['isolation']==0) |
78 |
| -self.assertTrue(aggs_failure[1]['sumtotal']['isolation']==0) |
79 |
| -self.assertTrue(aggs_failure[2]['sumtotal']['isolation']==0) |
80 |
| - |
81 |
| -self.assertTrue('commit'inaggs[0]['transfer']['finish'] ) |
82 |
| -self.assertTrue('commit'inaggs[1]['transfer']['finish'] ) |
83 |
| -self.assertTrue('commit'inaggs[2]['transfer']['finish'] ) |
84 |
| -self.assertTrue(aggs[0]['sumtotal']['isolation']==0) |
85 |
| -self.assertTrue(aggs[1]['sumtotal']['isolation']==0) |
86 |
| -self.assertTrue(aggs[2]['sumtotal']['isolation']==0) |
| 107 | +self.assertCommits(aggs) |
| 108 | +self.assertIsolation(aggs) |
87 | 109 |
|
88 | 110 |
|
89 | 111 | deftest_edge_partition(self):
|
|