regression tests on travis #5

kelvich · kelvich · commit 324b449f9b6b · 2016-10-21T17:09:18.000+03:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,4 @@
 sudo: required
-# language: python
-# python:
-#   - "3.4"
 
 services:
   - docker
diff --git a/contrib/mmts/Dockerfile b/contrib/mmts/Dockerfile
@@ -10,9 +10,9 @@ RUN export RAFTABLE_PATH=/pg/src/contrib/raftable && \
     cd /pg/mmts && make clean && make install
 
 # pg_regress client assumes such dir exists on server
-RUN mkdir /pg/src/src/test/regress/results
 
 USER postgres
+RUN mkdir /pg/src/src/test/regress/results
 ENV PGDATA /pg/data
 ENTRYPOINT ["/pg/mmts/tests2/docker-entrypoint.sh"]
 
diff --git a/contrib/mmts/tests2/lib/bank_client.py b/contrib/mmts/tests2/lib/bank_client.py
@@ -180,10 +180,10 @@ def run(self):
         self.loop = asyncio.get_event_loop()
 
         for i, _ in enumerate(self.dsns):
-            asyncio.async(self.exec_tx(self.transfer_tx, 'transfer', i))
-            asyncio.async(self.exec_tx(self.total_tx, 'sumtotal', i))
+            asyncio.ensure_future(self.exec_tx(self.transfer_tx, 'transfer', i))
+            asyncio.ensure_future(self.exec_tx(self.total_tx, 'sumtotal', i))
 
-        asyncio.async(self.status())
+        asyncio.ensure_future(self.status())
 
         self.loop.run_forever()
 
diff --git a/contrib/mmts/tests2/test_recovery.py b/contrib/mmts/tests2/test_recovery.py
@@ -1,17 +1,21 @@
 import unittest
 import time
 import subprocess
-# from lib.bank_client import *
-from client2 import MtmClient
+from lib.bank_client import MtmClient
+# from client2 import MtmClient
 import datetime
 
 class RecoveryTest(unittest.TestCase):
     @classmethod
     def setUpClass(self):
+        subprocess.check_call(['docker-compose','up',
+            '--force-recreate',
+            '-d'])
+        time.sleep(30)
         self.client = MtmClient([
-            "dbname=postgres user=postgres host=127.0.0.1 port=5435",
-            "dbname=postgres user=postgres host=127.0.0.1 port=5433",
-            "dbname=postgres user=postgres host=127.0.0.1 port=5434"
+            "dbname=regression user=postgres host=127.0.0.1 port=15432",
+            "dbname=regression user=postgres host=127.0.0.1 port=15433",
+            "dbname=regression user=postgres host=127.0.0.1 port=15434"
         ], n_accounts=1000)
         self.client.bgrun()
         time.sleep(5)
@@ -21,52 +25,53 @@ def tearDownClass(self):
         print('tearDown')
         self.client.stop()
 
-    # def test_normal_operations(self):
-    #     print('### normalOpsTest ###')
-
-    #     for i in range(3):
-    #         time.sleep(3)
-    #         aggs = self.clients.aggregate()
-    #         for agg in aggs:
-    #             # there were some commits
-    #             self.assertTrue( agg['transfer'] > 0 )
-
-    def test_node_partition(self):
-        print('### nodePartitionTest ###')
-
-        subprocess.check_call(['blockade','partition','node3'])
-        print('### blockade node3 ###')
-
-        # clear tx history
-        self.client.get_status()
+    def test_normal_operations(self):
+        print('### normalOpsTest ###')
 
         for i in range(3):
-            print(i, datetime.datetime.now())
             time.sleep(3)
             aggs = self.client.get_status()
             MtmClient.print_aggregates(aggs)
-            # self.assertTrue( aggs['transfer_0']['finish']['commit'] > 0 )
-            # self.assertTrue( aggs['transfer_1']['finish']['commit'] > 0 )
-            # self.assertTrue( aggs['transfer_2']['finish']['commit'] == 0 )
-            self.assertTrue( aggs['sumtotal_0']['isolation']  + aggs['sumtotal_1']['isolation'] + aggs['sumtotal_2']['isolation'] == 0 )
+            # for agg in aggs:
+            #     # there were some commits
+            #     self.assertTrue( agg['transfer'] > 0 )
 
-        subprocess.check_call(['blockade','join'])
-        print('### deblockade node3 ###')
+    # def test_node_partition(self):
+    #     print('### nodePartitionTest ###')
 
-        # clear tx history
-        self.client.get_status()
+    #     subprocess.check_call(['blockade','partition','node3'])
+    #     print('### blockade node3 ###')
 
-        for i in range(20):
-            print(i, datetime.datetime.now())
-            time.sleep(3)
-            aggs = self.client.get_status()
-            MtmClient.print_aggregates(aggs)
-            self.assertTrue( aggs['sumtotal_0']['isolation']  + aggs['sumtotal_1']['isolation'] + aggs['sumtotal_2']['isolation'] == 0 )
+    #     # clear tx history
+    #     self.client.get_status()
+
+    #     for i in range(3):
+    #         print(i, datetime.datetime.now())
+    #         time.sleep(3)
+    #         aggs = self.client.get_status()
+    #         MtmClient.print_aggregates(aggs)
+    #         # self.assertTrue( aggs['transfer_0']['finish']['commit'] > 0 )
+    #         # self.assertTrue( aggs['transfer_1']['finish']['commit'] > 0 )
+    #         # self.assertTrue( aggs['transfer_2']['finish']['commit'] == 0 )
+    #         self.assertTrue( aggs['sumtotal_0']['isolation']  + aggs['sumtotal_1']['isolation'] + aggs['sumtotal_2']['isolation'] == 0 )
 
-        # check that during last aggregation all nodes were working
-        self.assertTrue( aggs['transfer_0']['finish']['commit'] > 0 )
-        self.assertTrue( aggs['transfer_1']['finish']['commit'] > 0 )
-        self.assertTrue( aggs['transfer_2']['finish']['commit'] > 0 )
+    #     subprocess.check_call(['blockade','join'])
+    #     print('### deblockade node3 ###')
+
+    #     # clear tx history
+    #     self.client.get_status()
+
+    #     for i in range(20):
+    #         print(i, datetime.datetime.now())
+    #         time.sleep(3)
+    #         aggs = self.client.get_status()
+    #         MtmClient.print_aggregates(aggs)
+    #         self.assertTrue( aggs['sumtotal_0']['isolation']  + aggs['sumtotal_1']['isolation'] + aggs['sumtotal_2']['isolation'] == 0 )
+
+    #     # check that during last aggregation all nodes were working
+    #     self.assertTrue( aggs['transfer_0']['finish']['commit'] > 0 )
+    #     self.assertTrue( aggs['transfer_1']['finish']['commit'] > 0 )
+    #     self.assertTrue( aggs['transfer_2']['finish']['commit'] > 0 )
 
 
 
diff --git a/contrib/mmts/tests2/test_regression.py b/contrib/mmts/tests2/test_regression.py
@@ -7,7 +7,6 @@ class RecoveryTest(unittest.TestCase):
     @classmethod
     def setUpClass(self):
         subprocess.check_call(['docker-compose','up',
-            '--build',
             '--force-recreate',
             '-d'])
 
