1212from lib .failure_injector import *
1313
1414TEST_DURATION = 10
15- TEST_RECOVERY_TIME = 10
15+ TEST_RECOVERY_TIME = 20
1616
1717class RecoveryTest (unittest .TestCase ):
1818@classmethod
@@ -86,37 +86,6 @@ def test_node_partition(self):
8686self .assertTrue (aggs ['sumtotal_2' ]['isolation' ]== 0 )
8787
8888
89- def test_node_partition (self ):
90- print ('### nodePartitionTest ###' )
91-
92- failure = SingleNodePartition ('node3' )
93- failure .start ()
94-
95- self .client .clean_aggregates ()
96- time .sleep (TEST_DURATION )
97- aggs_failure = self .client .get_aggregates ()
98-
99- failure .stop ()
100-
101- self .client .clean_aggregates ()
102- time .sleep (TEST_RECOVERY_TIME )
103- aggs = self .client .get_aggregates ()
104-
105- self .assertTrue ('commit' in aggs_failure ['transfer_0' ]['finish' ] )
106- self .assertTrue ('commit' in aggs_failure ['transfer_1' ]['finish' ] )
107- self .assertTrue ('commit' not in aggs_failure ['transfer_2' ]['finish' ] )
108- self .assertTrue (aggs_failure ['sumtotal_0' ]['isolation' ]== 0 )
109- self .assertTrue (aggs_failure ['sumtotal_1' ]['isolation' ]== 0 )
110- self .assertTrue (aggs_failure ['sumtotal_2' ]['isolation' ]== 0 )
111-
112- self .assertTrue ('commit' in aggs ['transfer_0' ]['finish' ] )
113- self .assertTrue ('commit' in aggs ['transfer_1' ]['finish' ] )
114- self .assertTrue ('commit' in aggs ['transfer_2' ]['finish' ] )
115- self .assertTrue (aggs ['sumtotal_0' ]['isolation' ]== 0 )
116- self .assertTrue (aggs ['sumtotal_1' ]['isolation' ]== 0 )
117- self .assertTrue (aggs ['sumtotal_2' ]['isolation' ]== 0 )
118-
119-
12089def test_edge_partition (self ):
12190print ('### edgePartitionTest ###' )
12291
@@ -133,8 +102,8 @@ def test_edge_partition(self):
133102time .sleep (TEST_RECOVERY_TIME )
134103aggs = self .client .get_aggregates ()
135104
136- self .assertTrue ( ('commit' in aggs_failure ['transfer_0 ' ]['finish' ])or ('commit' in aggs_failure ['transfer_1' ]['finish' ]) )
137- self .assertTrue ('commit' not in aggs_failure ['transfer_2 ' ]['finish' ] )
105+ self .assertTrue ( ('commit' in aggs_failure ['transfer_2 ' ]['finish' ])or ('commit' in aggs_failure ['transfer_1' ]['finish' ]) )
106+ self .assertTrue ('commit' in aggs_failure ['transfer_0 ' ]['finish' ] )
138107self .assertTrue (aggs_failure ['sumtotal_0' ]['isolation' ]== 0 )
139108self .assertTrue (aggs_failure ['sumtotal_1' ]['isolation' ]== 0 )
140109self .assertTrue (aggs_failure ['sumtotal_2' ]['isolation' ]== 0 )