allow more load in tests

Author: kelvich

tests2/lib/bank_client.py

@@ -311,7 +311,7 @@ def run(self):
             for j in range(1):
                 asyncio.ensure_future(self.exec_tx(self.transfer_tx, i, 'transfer', j))
             asyncio.ensure_future(self.exec_tx(self.total_tx, i, 'sumtotal', 0))
-            for j in range(2):
+            for j in range(10):
                 asyncio.ensure_future(self.exec_tx(self.insert_tx, i, 'inserter', j))
 
         asyncio.ensure_future(self.status())

tests2/lib/test_helper.py

@@ -3,10 +3,10 @@
 import datetime
 import psycopg2
 
-TEST_WARMING_TIME = 5
+TEST_WARMING_TIME = 3
 TEST_DURATION = 10
-TEST_MAX_RECOVERY_TIME = 300
-TEST_RECOVERY_TIME = 30
+TEST_MAX_RECOVERY_TIME = 600
+TEST_RECOVERY_TIME = 5
 TEST_SETUP_TIME = 20
 TEST_STOP_DELAY = 5
 

tests2/test_referee.py

@@ -76,7 +76,7 @@ def test_neighbor_restart(self):
     def test_node_crash(self):
         print('### test_node_crash ###')
 
-        aggs_failure, aggs = self.performFailure(CrashRecoverNode('node2'), node_wait_for_commit=1)
+        aggs_failure, aggs = self.performFailure(CrashRecoverNode('node2'), node_wait_for_online="dbname=regression user=postgres host=127.0.0.1 port=15433", stop_load=True)
 
         self.assertCommits(aggs_failure[:1])
         self.assertNoCommits(aggs_failure[1:])
@@ -89,7 +89,7 @@ def test_node_crash(self):
     def test_partition_referee(self):
         print('### test_partition_referee ###')
 
-        aggs_failure, aggs = self.performFailure(SingleNodePartition('node2'), node_wait_for_commit=1)
+        aggs_failure, aggs = self.performFailure(SingleNodePartition('node2'), node_wait_for_online="dbname=regression user=postgres host=127.0.0.1 port=15433", stop_load=True)
 
         self.assertCommits(aggs_failure[:1])
         self.assertNoCommits(aggs_failure[1:])
@@ -102,7 +102,7 @@ def test_partition_referee(self):
     def test_double_failure_referee(self):
         print('### test_double_failure_referee ###')
 
-        aggs_failure, aggs = self.performFailure(SingleNodePartition('node2'), node_wait_for_commit=1)
+        aggs_failure, aggs = self.performFailure(SingleNodePartition('node2'), node_wait_for_online="dbname=regression user=postgres host=127.0.0.1 port=15433", stop_load=True)
 
         self.assertCommits(aggs_failure[:1])
         self.assertNoCommits(aggs_failure[1:])
@@ -111,7 +111,7 @@ def test_double_failure_referee(self):
         self.assertCommits(aggs)
         self.assertIsolation(aggs)
 
-        aggs_failure, aggs = self.performFailure(SingleNodePartition('node1'), node_wait_for_commit=0)
+        aggs_failure, aggs = self.performFailure(SingleNodePartition('node1'), node_wait_for_online="dbname=regression user=postgres host=127.0.0.1 port=15432", stop_load=True)
 
         self.assertNoCommits(aggs_failure[:1])
         self.assertCommits(aggs_failure[1:])
@@ -172,10 +172,16 @@ def test_saved_referee_decision(self):
         self.assertNoCommits(aggs)
         self.assertIsolation(aggs)
 
+        self.client.get_aggregates(clean=False)
+        self.client.stop()
+
         print('#### up up(winner) || up')
         print('###########################')
         docker_api.containers.get('node2').start()
-        self.awaitCommit(0)
+        self.awaitOnline("dbname=regression user=postgres host=127.0.0.1 port=15432")
+
+        self.client.bgrun()
+        time.sleep(3)
 
         # give it time to clean old decision
         time.sleep(5)
@@ -185,7 +191,7 @@ def test_saved_referee_decision(self):
         con = psycopg2.connect("dbname=regression user=postgres host=127.0.0.1 port=15435")
         con.autocommit = True
         cur = con.cursor()
-        cur.execute("select node_id into winner_id from referee.decision where key = 'winner'")
+        cur.execute("select node_id from referee.decision where key = 'winner'")
         decisions_count = cur.rowcount
         cur.close()
         con.close()