Commit154e5f5

committed

[PGPRO-11597] Redesigned the launch of isolation tests

"CREATE/DROP EXTENSION" has been removed from spec.Instead, the "ISOLATION_OPTS" variable is used.Tags: pg_query_state

1 parent0c6e36a commit154e5f5Copy full SHA for 154e5f5

File tree

-13

lines changed

-13

lines changed

Lines changed: 0 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -33,13 +33,11 @@ env:`
`33`	`33`	`-PG_VERSION=13`
`34`	`34`	`-PG_VERSION=12 LEVEL=hardcore USE_TPCDS=1`
`35`	`35`	`-PG_VERSION=12`
`36`		`- -PG_VERSION=11`
`37`	`36`	`-PG_VERSION=10`
`38`	`37`	`-PG_VERSION=9.6`
`39`	`38`
`40`	`39`	`matrix:`
`41`	`40`	`allow_failures:`
`42`	`41`	`-env:PG_VERSION=13 LEVEL=hardcore USE_TPCDS=1`
`43`		`- -env:PG_VERSION=11`
`44`	`42`	`-env:PG_VERSION=10`
`45`	`43`	`-env:PG_VERSION=9.6`

Lines changed: 2 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,14 +13,8 @@ EXTRA_CLEAN = ./isolation_output $(EXTENSION)--$(EXTVERSION).sql \`
`13`	`13`	`Dockerfile ./tests/*.pyc ./tmp_stress`
`14`	`14`
`15`	`15`	`ISOLATION = corner_cases`
`16`		`-#`
`17`		`-# PG11 doesn't support ISOLATION_OPTS variable. We have to use`
`18`		`-# "CREATE/DROP EXTENTION" command in spec.`
`19`		`-#`
`20`		`-# One day, when we'll get rid of PG11, it will be possible to uncomment this`
`21`		`-# variable and remove "CREATE EXTENTION" from spec.`
`22`		`-#`
`23`		`-# ISOLATION_OPTS = --load-extension=pg_query_state`
	`16`	`+`
	`17`	`+ISOLATION_OPTS = --load-extension=pg_query_state`
`24`	`18`
`25`	`19`	`ifdefUSE_PGXS`
`26`	`20`	`PG_CONFIG ?= pg_config`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -20,7 +20,7 @@ To install `pg_query_state`, please apply corresponding patches `custom_signal_(
`20`	`20`	`To do this, run the following commands from the postgresql directory:`
`21`	`21`	```
`22`	`22`	`patch -p1 < path_to_pg_query_state_folder/patches/runtime_explain_(PG_VERSION).patch`
`23`		`-patch -p1 < path_to_pg_query_state_folder/patches/custom_signal_(PG_VERSION).patch`
	`23`	`+patch -p1 < path_to_pg_query_state_folder/patches/custom_signals_(PG_VERSION).patch`
`24`	`24`	```
`25`	`25`
`26`	`26`	`Then execute this in the module's directory:`

Lines changed: 0 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`setup`
`2`	`2`	`{`
`3`		`-CREATEEXTENSIONpg_query_state;`
`4`	`3`	`CREATEROLEalice;`
`5`	`4`	`CREATEROLEbob;`
`6`	`5`	`CREATEROLEsuperSUPERUSER;`
`@@ -31,7 +30,6 @@ teardown`
`31`	`30`	`DROPROLEsuper;`
`32`	`31`	`DROPROLEbob;`
`33`	`32`	`DROPROLEalice;`
`34`		`-DROPEXTENSIONpg_query_state;`
`35`	`33`	`}`
`36`	`34`
`37`	`35`	`session"s1"`

Comments

(0)