Commit6fe3867

committed

Fix regreession test runner

1 parentc8c6143 commit6fe3867Copy full SHA for 6fe3867

File tree

-9

lines changed

-9

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ RUN export RAFTABLE_PATH=/pg/src/contrib/raftable && \`
`10`	`10`	`cd /pg/mmts && make clean && make install`
`11`	`11`
`12`	`12`	`# pg_regress client assumes such dir exists on server`
`13`		`-`
	`13`	`+RUN cp /pg/src/src/test/regress/*.so /pg/install/lib/postgresql/`
`14`	`14`	`USER postgres`
`15`	`15`	`RUN mkdir /pg/src/src/test/regress/results`
`16`	`16`	`ENV PGDATA /pg/data`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -71,8 +71,8 @@ if [ "$1" = 'postgres' ]; then`
`71`	`71`	`multimaster.conn_strings = '$CONNSTRS'`
`72`	`72`	`multimaster.heartbeat_recv_timeout = 1100`
`73`	`73`	`multimaster.heartbeat_send_timeout = 250`
`74`		`-multimaster.twopc_min_timeout =20000`
`75`		`-multimaster.min_2pc_timeout =10000`
	`74`	`+multimaster.twopc_min_timeout =50000`
	`75`	`+multimaster.min_2pc_timeout =50000`
`76`	`76`	`EOF`
`77`	`77`
`78`	`78`	`cat$PGDATA/postgresql.conf`

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,11 +5,10 @@ cd /pg/src/src/test/regress`
`5`	`5`	`./pg_regress --use-existing \`
`6`	`6`	`--schedule=parallel_schedule \`
`7`	`7`	`--host=node1 \`
`8`		`- --user=postgres \`
`9`		`- --dlpath=/pg/src/src/test/regress/`
	`8`	`+ --user=postgres`
`10`	`9`
`11`	`10`	`STATUS=$?`
`12`	`11`
`13`		`-cat regression.diffs`
	`12`	`+#cat regression.diffs`
`14`	`13`
`15`	`14`	`exit$STATUS`

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -18,9 +18,8 @@ def tearDownClass(self):`
`18`	`18`	`deftest_regression(self):`
`19`	`19`	`# XXX: make smth clever here`
`20`	`20`	`time.sleep(31)`
`21`		`-subprocess.check_call(['docker','run',`
`22`		`-'--network=tests2_default',`
`23`		`-'tests2_node1',`
	`21`	`+subprocess.check_call(['docker','exec',`
	`22`	`+'node1',`
`24`	`23`	`'/pg/mmts/tests2/support/docker-regress.sh',`
`25`	`24`	`])`
`26`	`25`

Comments

(0)