Commit0329690

committed

fix error handling in bank_client

1 parent189b980 commit0329690Copy full SHA for 0329690

File tree

-20

lines changed

-20

lines changed

Lines changed: 0 additions & 15 deletions

Original file line number	Diff line number	Diff line change
`@@ -36,18 +36,3 @@ endif`
`36`	`36`	`check:`
`37`	`37`	`env DESTDIR='$(abs_top_builddir)'/tmp_install make install`
`38`	`38`	`$(prove_check)`
`39`		`-`
`40`		`-xcheck:`
`41`		`-#pip install -r tests2/requirements.txt`
`42`		`-docker build -t pgmmts.`
`43`		`-cd tests2&& blockade destroy\|\|true`
`44`		`-cd tests2&& docker rm node1\|\|true`
`45`		`-cd tests2&& docker rm node2\|\|true`
`46`		`-cd tests2&& docker rm node3\|\|true`
`47`		`-cd tests2&& docker network rm tests2_net\|\|true`
`48`		`-cd tests2&& docker network rm tests2_net\|\|true`
`49`		`-cd tests2&& blockade up`
`50`		`-sleep 20# wait for mmts init`
`51`		`-cd tests2&& python3 test_recovery.py`
`52`		`-#cd tests2 && blockade destroy`
`53`		`-`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,8 @@ def exec_tx(self, tx_block, aggname_prefix, conn_i):`
`135`	`135`	`yieldfromtx_block(conn,cur,agg)`
`136`	`136`	`agg.finish_tx('commit')`
`137`	`137`	`exceptpsycopg2.OperationalErrorase:`
`138`		`-yieldfromcur.execute('rollback')`
	`138`	`+ifnotcur.closed:`
	`139`	`+yieldfromcur.execute('rollback')`
`139`	`140`	`agg.finish_tx('operational_rollback')`
`140`	`141`	`exceptpsycopg2.Errorase:`
`141`	`142`	`agg.finish_tx(e.pgerror)`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ def __init__(self):`
`6`	`6`	`self.docker_api=docker.Client()`
`7`	`7`
`8`	`8`	`defcontainer_exec(self,node,command):`
`9`		`-exec_id=self.docker_api.exec_create(node,command)`
	`9`	`+exec_id=self.docker_api.exec_create(node,command,user='root')`
`10`	`10`	`output=self.docker_api.exec_start(exec_id)`
`11`	`11`	`print(command,' -> ',output)`
`12`	`12`

Lines changed: 1 addition & 1 deletion

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -96,8 +96,8 @@ def test_node_partition(self):`
`96`	`96`	`self.assertTrue(aggs['sumtotal_1']['isolation']==0)`
`97`	`97`	`self.assertTrue(aggs['sumtotal_2']['isolation']==0)`
`98`	`98`
`99`		`-deftest_edge_partition(self):`
`100`		`-#`
	`99`	`+#def test_edge_partition(self):`
	`100`	`+`
`101`	`101`
`102`	`102`
`103`	`103`

Comments

(0)