fixes for test_recovery.py

Author: kelvich

tests2/lib/test_helper.py

@@ -95,11 +95,6 @@ def performFailure(self, failure, wait=0, node_wait_for_commit=-1, node_wait_for
             self.client.get_aggregates(clean=False)
             self.client.stop()
 
-        if node_wait_for_commit >= 0:
-            self.awaitCommit(node_wait_for_commit)
-        else:
-            time.sleep(TEST_RECOVERY_TIME)
-
         if node_wait_for_online != None:
             self.awaitOnline(node_wait_for_online)
         else:
@@ -109,6 +104,11 @@ def performFailure(self, failure, wait=0, node_wait_for_commit=-1, node_wait_for
             self.client.bgrun()
             time.sleep(3)
 
+        if node_wait_for_commit >= 0:
+            self.awaitCommit(node_wait_for_commit)
+        else:
+            time.sleep(TEST_RECOVERY_TIME)
+
         aggs = self.client.get_aggregates()
 
         return (aggs_failure, aggs)

tests2/test_recovery.py

@@ -123,7 +123,7 @@ def test_node_bicrash(self):
         print('### test_node_bicrash ###')
 
         aggs_failure, aggs = self.performFailure(CrashRecoverNode('node3'),
-            node_wait_for_online="dbname=regression user=postgres host=127.0.0.1 port=15434", stop_load=True)
+            node_wait_for_commit=2, stop_load=True)
 
         self.assertCommits(aggs_failure[:2])
         self.assertNoCommits(aggs_failure[2:])
@@ -133,7 +133,7 @@ def test_node_bicrash(self):
         self.assertIsolation(aggs)
 
         aggs_failure, aggs = self.performFailure(CrashRecoverNode('node1'),
-            node_wait_for_online="dbname=regression user=postgres host=127.0.0.1 port=15432", stop_load=True)
+            node_wait_for_commit=0, stop_load=True)
 
         self.assertNoCommits(aggs_failure[0:1])  # [1]
         self.assertCommits(aggs_failure[1:]) # [2, 3]