NotificationsYou must be signed in to change notification settings
Fork28
Star151

Commit8a5d7b7

committed

Fix regreession test runner

1 parent5844e82 commit8a5d7b7Copy full SHA for 8a5d7b7

File tree

6 files changed

+15

-17

lines changed

.travis.yml
contrib/mmts
- Dockerfile
- tests2
  - docker-entrypoint.sh
  - support
    - docker-regress.sh
  - test_regression.py
src/test/regress
- parallel_schedule

6 files changed

+15

-17

lines changed

`‎.travis.yml`

Lines changed: 3 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,26 +5,24 @@ services:`
`5`	`5`
`6`	`6`	`before_script:env && pip3 install -r contrib/mmts/tests2/requirements.txt`
`7`	`7`
`8`		`-# script: cd contrib/mmts/tests2 && python3 test_regression.py`
`9`		`-script:cd contrib/mmts/tests2 && python3 test_recovery.py`
	`8`	`+script:cd contrib/mmts/tests2 && python3 -m unittest discover`
`10`	`9`
`11`	`10`	`notifications:`
`12`	`11`	`email:`
`13`	`12`	`-s.kelvich@postgrespro.ru`
	`13`	`+ -k.knizhnik@postgrespro.ru`
`14`	`14`
	`15`	`+## Old TAP-based tests:`
`15`	`16`
`16`	`17`	`# language: perl`
`17`	`18`	`# os:`
`18`	`19`	`# - linux`
`19`		`-# #- osx`
`20`	`20`	`# compiler:`
`21`	`21`	`# - gcc`
`22`	`22`	`# - clang`
`23`	`23`	`# install: cpanm IPC::Run DBD::Pg Proc::ProcessTable`
`24`	`24`	`# before_script: ./configure --enable-cassert --enable-tap-tests && make -j4`
`25`	`25`	`# env:`
`26`		`-# #- TESTDIR=.`
`27`		`-# #- TESTDIR=src/test/recovery`
`28`	`26`	`# - TESTDIR=contrib/raftable`
`29`	`27`	`# - TESTDIR=contrib/mmts`
`30`	`28`	`# script: cd $TESTDIR && make check`
`@@ -33,4 +31,3 @@ notifications:`
`33`	`31`	`# - s.kelvich@postgrespro.ru`
`34`	`32`	`# - c.pan@postgrespro.ru`
`35`	`33`	`# - k.knizhnik@postgrespro.ru`
`36`		`-`

`‎contrib/mmts/Dockerfile`

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`

`‎contrib/mmts/tests2/docker-entrypoint.sh`

Lines changed: 2 additions & 2 deletions

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

`‎contrib/mmts/tests2/support/docker-regress.sh`

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`

`‎contrib/mmts/tests2/test_regression.py`

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`

`‎src/test/regress/parallel_schedule`

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ ignore: random`
`79`	`79`	`# ----------`
`80`	`80`	`# Another group of parallel tests`
`81`	`81`	`# ----------`
`82`		`-test: select_into select_distinct select_distinct_on select_implicit select_having subselect union case join aggregates transactions random portals arrays btree_index hash_index update namespaceprepared_xactsdelete`
	`82`	`+test: select_into select_distinct select_distinct_on select_implicit select_having subselect union case join aggregates transactions random portals arrays btree_index hash_index update namespace delete`
`83`	`83`
`84`	`84`	`# ----------`
`85`	`85`	`# Another group of parallel tests`
`@@ -103,7 +103,10 @@ test: select_views portals_p2 foreign_key cluster dependency guc bitmapops combo`
`103`	`103`	`# NB: temp.sql does a reconnect which transiently uses 2 connections,`
`104`	`104`	`# so keep this parallel group to at most 19 tests`
`105`	`105`	`# ----------`
`106`		`-test: plancache limit plpgsql copy2 temp domain rangefuncs prepare without_oid conversion truncate alter_table sequence polymorphism rowtypes returning largeobject with xml`
	`106`	`+test: plancache limit plpgsql temp domain rangefuncs prepare conversion truncate alter_table sequence polymorphism returning with xml`
	`107`	`+`
	`108`	`+# multimaster`
	`109`	`+ignore: copy2 without_oid rowtypes largeobject`
`107`	`110`
`108`	`111`	`# event triggers cannot run concurrently with any test that runs DDL`
`109`	`112`	`test: event_trigger`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit8a5d7b7

File tree

6 files changed

6 files changed

`‎.travis.yml`

`‎contrib/mmts/Dockerfile`

`‎contrib/mmts/tests2/docker-entrypoint.sh`

`‎contrib/mmts/tests2/support/docker-regress.sh`

`‎contrib/mmts/tests2/test_regression.py`

`‎src/test/regress/parallel_schedule`

0 commit comments