Movatterモバイル変換

Skip to content

postgrespro/postgresPublic

forked frompostgres/postgres

NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitf45cbed

tglsfdc

committed

Increase hard-wired timeout values in ecpg regression tests.

A couple of test cases had connect_timeout=14, a value that seemsto have been plucked from a hat. While it's more than sufficientfor normal cases, slow/overloaded buildfarm machines can get a timeoutfailure here, as per recent report from "sungazer". Increase to 180seconds, which is in line with our typical timeouts elsewhere inthe regression tests.Back-patch to 9.6; the code looks different in 9.5, and this doesn'tseem to be quite worth the effort to adapt to that.Report:https://buildfarm.postgresql.org/cgi-bin/show_log.pl?nm=sungazer&dt=2020-08-04%2007%3A12%3A22

1 parent995c53b commitf45cbedCopy full SHA for f45cbed

File tree

7 files changed

+7

-7

lines changed

src/interfaces/ecpg/test
- connect
  - test1.pgc
  - test5.pgc
- expected

7 files changed

+7

-7

lines changed

`‎src/interfaces/ecpg/test/connect/test1.pgc`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ exec sql end declare section;`
`46`	`46`	`exec sql connect to unix:postgresql://localhost/ecpg2_regression user regress_ecpg_user1 using "connectpw";`
`47`	`47`	`exec sql disconnect;`
`48`	`48`
`49`		`-exec sql connect to unix:postgresql://localhost/ecpg2_regression?connect_timeout=14 user regress_ecpg_user1;`
	`49`	`+exec sql connect to unix:postgresql://localhost/ecpg2_regression?connect_timeout=180 user regress_ecpg_user1;`
`50`	`50`	`exec sql disconnect;`
`51`	`51`
`52`	`52`	`/* wrong db */`

`‎src/interfaces/ecpg/test/connect/test5.pgc`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ exec sql end declare section;`
`55`	`55`	`exec sql connect to 'unix:postgresql://localhost/ecpg2_regression' as main user :user USING "connectpw";`
`56`	`56`	`exec sql disconnect main;`
`57`	`57`
`58`		`-exec sql connect to unix:postgresql://localhost/ecpg2_regression?connect_timeout=14&client_encoding=latin1 as main user regress_ecpg_user1/connectpw;`
	`58`	`+exec sql connect to unix:postgresql://localhost/ecpg2_regression?connect_timeout=180&client_encoding=latin1 as main user regress_ecpg_user1/connectpw;`
`59`	`59`	`exec sql disconnect main;`
`60`	`60`
`61`	`61`	`exec sql connect to "unix:postgresql://200.46.204.71/ecpg2_regression" as main user regress_ecpg_user1/connectpw;`

`‎src/interfaces/ecpg/test/expected/connect-test1-minGW32.stderr`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@`
`48`	`48`	`[NO_PID]: sqlca: code: 0, state: 00000`
`49`	`49`	`[NO_PID]: ecpg_finish: connection ecpg2_regression closed`
`50`	`50`	`[NO_PID]: sqlca: code: 0, state: 00000`
`51`		`-[NO_PID]: ECPGconnect: opening database ecpg2_regression on <DEFAULT> port <DEFAULT> with options connect_timeout=14 for user regress_ecpg_user1`
	`51`	`+[NO_PID]: ECPGconnect: opening database ecpg2_regression on <DEFAULT> port <DEFAULT> with options connect_timeout=180 for user regress_ecpg_user1`
`52`	`52`	`[NO_PID]: sqlca: code: 0, state: 00000`
`53`	`53`	`[NO_PID]: ecpg_finish: connection ecpg2_regression closed`
`54`	`54`	`[NO_PID]: sqlca: code: 0, state: 00000`

`‎src/interfaces/ecpg/test/expected/connect-test1.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ main(void)`
`93`	`93`	`#line 47 "test1.pgc"`
`94`	`94`
`95`	`95`
`96`		`-{ECPGconnect(__LINE__,0,"unix:postgresql://localhost/ecpg2_regression?connect_timeout=14" ,"regress_ecpg_user1" ,NULL ,NULL,0); }`
	`96`	`+{ECPGconnect(__LINE__,0,"unix:postgresql://localhost/ecpg2_regression?connect_timeout=180" ,"regress_ecpg_user1" ,NULL ,NULL,0); }`
`97`	`97`	`#line 49 "test1.pgc"`
`98`	`98`
`99`	`99`	`{ECPGdisconnect(__LINE__,"CURRENT");}`

`‎src/interfaces/ecpg/test/expected/connect-test1.stderr`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@`
`48`	`48`	`[NO_PID]: sqlca: code: 0, state: 00000`
`49`	`49`	`[NO_PID]: ecpg_finish: connection ecpg2_regression closed`
`50`	`50`	`[NO_PID]: sqlca: code: 0, state: 00000`
`51`		`-[NO_PID]: ECPGconnect: opening database ecpg2_regression on <DEFAULT> port <DEFAULT> with options connect_timeout=14 for user regress_ecpg_user1`
	`51`	`+[NO_PID]: ECPGconnect: opening database ecpg2_regression on <DEFAULT> port <DEFAULT> with options connect_timeout=180 for user regress_ecpg_user1`
`52`	`52`	`[NO_PID]: sqlca: code: 0, state: 00000`
`53`	`53`	`[NO_PID]: ecpg_finish: connection ecpg2_regression closed`
`54`	`54`	`[NO_PID]: sqlca: code: 0, state: 00000`

`‎src/interfaces/ecpg/test/expected/connect-test5.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ main(void)`
`121`	`121`	`#line 56 "test5.pgc"`
`122`	`122`
`123`	`123`
`124`		`-{ECPGconnect(__LINE__,0,"unix:postgresql://localhost/ecpg2_regression?connect_timeout=14 & client_encoding=latin1" ,"regress_ecpg_user1" ,"connectpw" ,"main",0); }`
	`124`	`+{ECPGconnect(__LINE__,0,"unix:postgresql://localhost/ecpg2_regression?connect_timeout=180 & client_encoding=latin1" ,"regress_ecpg_user1" ,"connectpw" ,"main",0); }`
`125`	`125`	`#line 58 "test5.pgc"`
`126`	`126`
`127`	`127`	`{ECPGdisconnect(__LINE__,"main");}`

`‎src/interfaces/ecpg/test/expected/connect-test5.stderr`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@`
`61`	`61`	`[NO_PID]: sqlca: code: 0, state: 00000`
`62`	`62`	`[NO_PID]: ecpg_finish: connection main closed`
`63`	`63`	`[NO_PID]: sqlca: code: 0, state: 00000`
`64`		`-[NO_PID]: ECPGconnect: opening database ecpg2_regression on <DEFAULT> port <DEFAULT> with options connect_timeout=14 & client_encoding=latin1 for user regress_ecpg_user1`
	`64`	`+[NO_PID]: ECPGconnect: opening database ecpg2_regression on <DEFAULT> port <DEFAULT> with options connect_timeout=180 & client_encoding=latin1 for user regress_ecpg_user1`
`65`	`65`	`[NO_PID]: sqlca: code: 0, state: 00000`
`66`	`66`	`[NO_PID]: ecpg_finish: connection main closed`
`67`	`67`	`[NO_PID]: sqlca: code: 0, state: 00000`

0 commit comments

Comments

(0)

[8]ページ先頭

©2009-2025 Movatter.jp