do more tests without db reinit

Author: kelvich

tests2/lib/test_helper.py

@@ -66,6 +66,18 @@ def awaitOnline(self, dsn):
                 time.sleep(5)
                 total_sleep += 5
 
+    def assertDataSync(self):
+        self.client.stop()
+
+        if not self.client.is_data_identic():
+            raise AssertionError('Different data on nodes')
+
+        if self.client.no_prepared_tx() != 0:
+            raise AssertionError('There are some uncommitted tx')
+
+        self.client.bgrun()
+
+
     def performFailure(self, failure, wait=0, node_wait_for_commit=-1, node_wait_for_online=None, stop_load=False):
 
         time.sleep(TEST_WARMING_TIME)

tests2/test_recovery.py

@@ -84,11 +84,11 @@ def test_node_partition(self):
     def test_edge_partition(self):
         print('### test_edge_partition ###')
 
-        aggs_failure, aggs = self.performFailure(EdgePartition('node2', 'node3'),
+        aggs_failure, aggs = self.performFailure(EdgePartition('node1', 'node3'),
             node_wait_for_online="dbname=regression user=postgres host=127.0.0.1 port=15434", stop_load=True)
 
-        self.assertTrue( ('commit' in aggs_failure[1]['transfer']['finish']) or ('commit' in aggs_failure[2]['transfer']['finish']) )
-        self.assertCommits(aggs_failure[0:1]) # first node
+        self.assertTrue( ('commit' in aggs_failure[0]['transfer']['finish']) or ('commit' in aggs_failure[2]['transfer']['finish']) )
+        self.assertCommits(aggs_failure[1:2]) # second node
         self.assertIsolation(aggs_failure)
 
         self.assertCommits(aggs)
@@ -136,25 +136,30 @@ def test_node_crash(self):
     def test_node_bicrash(self):
         print('### test_node_bicrash ###')
 
-        aggs_failure, aggs = self.performFailure(CrashRecoverNode('node3'),
-            node_wait_for_commit=2, stop_load=True)
+        for _ in range(10):
+            aggs_failure, aggs = self.performFailure(CrashRecoverNode('node3'),
+                node_wait_for_commit=2, stop_load=True)
 
-        self.assertCommits(aggs_failure[:2])
-        self.assertNoCommits(aggs_failure[2:])
-        self.assertIsolation(aggs_failure)
+            self.assertCommits(aggs_failure[:2])
+            self.assertNoCommits(aggs_failure[2:])
+            self.assertIsolation(aggs_failure)
 
-        self.assertCommits(aggs)
-        self.assertIsolation(aggs)
+            self.assertCommits(aggs)
+            self.assertIsolation(aggs)
 
-        aggs_failure, aggs = self.performFailure(CrashRecoverNode('node1'),
-            node_wait_for_commit=0, stop_load=True)
+            aggs_failure, aggs = self.performFailure(CrashRecoverNode('node1'),
+                node_wait_for_commit=0, stop_load=True)
 
-        self.assertNoCommits(aggs_failure[0:1])  # [1]
-        self.assertCommits(aggs_failure[1:]) # [2, 3]
-        self.assertIsolation(aggs_failure)
+            self.assertNoCommits(aggs_failure[0:1])  # [1]
+            self.assertCommits(aggs_failure[1:]) # [2, 3]
+            self.assertIsolation(aggs_failure)
+
+            self.assertCommits(aggs)
+            self.assertIsolation(aggs)
+
+            self.assertDataSync()
+            print('### iteration okay ###')
 
-        self.assertCommits(aggs)
-        self.assertIsolation(aggs)
 
 if __name__ == '__main__':
     unittest.main()