Catch exit status in regression test.

kelvich · kelvich · commit dac6e9f27026 · 2016-10-24T18:19:06.000+03:00
diff --git a/contrib/mmts/tests2/docker-compose.yml b/contrib/mmts/tests2/docker-compose.yml
@@ -11,7 +11,7 @@ services:
       POSTGRES_DB: 'regression'
       NODE_ID: 1
       CONNSTRS: >-
-        dbname=regression user=pg host=node1 arbiterport=5433,
+        dbname=regression user=pg host=node1,
         dbname=regression user=pg host=toxi port=12000 arbiterport=12001,
         dbname=regression user=pg host=toxi port=13000 arbiterport=13001
     ports:
@@ -27,7 +27,7 @@ services:
       NODE_ID: 2
       CONNSTRS: >-
         dbname=regression user=pg host=toxi port=21000 arbiterport=21001,
-        dbname=regression user=pg host=node2 arbiterport=5433,
+        dbname=regression user=pg host=node2,
         dbname=regression user=pg host=toxi port=23000 arbiterport=23001
     ports:
       - "15433:5432"
@@ -43,7 +43,7 @@ services:
       CONNSTRS: >-
         dbname=regression user=pg host=toxi port=31000 arbiterport=31001,
         dbname=regression user=pg host=toxi port=32000 arbiterport=32001,
-        dbname=regression user=pg host=node3 arbiterport=5433
+        dbname=regression user=pg host=node3
     ports:
       - "15434:5432"
 
diff --git a/contrib/mmts/tests2/docker-regress.sh b/contrib/mmts/tests2/docker-regress.sh
@@ -2,12 +2,14 @@
 
 cd /pg/src/src/test/regress
 
-cat /etc/hosts
-
 ./pg_regress --use-existing \
     --schedule=parallel_schedule \
     --host=node1 \
     --user=postgres \
     --dlpath=/pg/src/src/test/regress/
 
+STATUS = $?
+
 cat regression.diffs
+
+exit $STATUS
diff --git a/contrib/mmts/tests2/test_recovery.py b/contrib/mmts/tests2/test_recovery.py
@@ -31,46 +31,46 @@ def test_normal_operations(self):
             time.sleep(3)
             aggs = self.client.get_status()
             MtmClient.print_aggregates(aggs)
-            # 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()
-
-    #     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 )
-
-    #     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 )
+            print(aggs)
+            for agg in aggs:
+                self.assertTrue( aggs[agg]['finish']['commit'] > 0 )
+
+    def test_node_partition(self):
+        print('### nodePartitionTest ###')
+
+        subprocess.check_call(['blockade','partition','node3'])
+        print('### blockade node3 ###')
+
+        # 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 )
+
+        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 )
 
 
 
