fix error handling in bank_client

kelvich · kelvich · commit ba8edb6253f8 · 2016-10-28T03:45:12.000+03:00
diff --git a/contrib/mmts/Makefile b/contrib/mmts/Makefile
@@ -36,18 +36,3 @@ endif
 check:
 	env DESTDIR='$(abs_top_builddir)'/tmp_install make install
 	$(prove_check)
-
-xcheck:
-	#pip install -r tests2/requirements.txt
-	docker build -t pgmmts .
-	cd tests2 && blockade destroy || true
-	cd tests2 && docker rm node1 || true
-	cd tests2 && docker rm node2 || true
-	cd tests2 && docker rm node3 || true
-	cd tests2 && docker network rm tests2_net || true
-	cd tests2 && docker network rm tests2_net || true
-	cd tests2 && blockade up
-	sleep 20 # wait for mmts init
-	cd tests2 && python3 test_recovery.py
-	#cd tests2 && blockade destroy
-
diff --git a/contrib/mmts/tests2/lib/bank_client.py b/contrib/mmts/tests2/lib/bank_client.py
@@ -135,7 +135,8 @@ def exec_tx(self, tx_block, aggname_prefix, conn_i):
                 yield from tx_block(conn, cur, agg)
                 agg.finish_tx('commit')
             except psycopg2.OperationalError as e:
-                yield from cur.execute('rollback')
+                if not cur.closed:
+                    yield from cur.execute('rollback')
                 agg.finish_tx('operational_rollback')
             except psycopg2.Error as e:
                 agg.finish_tx(e.pgerror)
diff --git a/contrib/mmts/tests2/lib/failure_injector.py b/contrib/mmts/tests2/lib/failure_injector.py
@@ -6,7 +6,7 @@ def __init__(self):
         self.docker_api = docker.Client()
 
     def container_exec(self, node, command):
-        exec_id = self.docker_api.exec_create(node, command)
+        exec_id = self.docker_api.exec_create(node, command, user='root')
         output = self.docker_api.exec_start(exec_id)
         print(command, ' -> ', output)
 
diff --git a/contrib/mmts/tests2/requirements.txt b/contrib/mmts/tests2/requirements.txt
@@ -1,4 +1,4 @@
 psycopg2
 aiopg
 aioprocessing
-docker
+docker-py
diff --git a/contrib/mmts/tests2/test_recovery.py b/contrib/mmts/tests2/test_recovery.py
@@ -96,8 +96,8 @@ def test_node_partition(self):
         self.assertTrue( aggs['sumtotal_1']['isolation'] == 0)
         self.assertTrue( aggs['sumtotal_2']['isolation'] == 0)
 
-    def test_edge_partition(self):
-        #
+    # def test_edge_partition(self):
+
 
 
 
