Skip to content

Navigation Menu

Sign in
Appearance settings

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

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 1fac10d

Browse filesBrowse files
tglsfdctglsfdc
committed
Increase hard-wired timeout values in ecpg regression tests.
A couple of test cases had connect_timeout=14, a value that seems to have been plucked from a hat. While it's more than sufficient for normal cases, slow/overloaded buildfarm machines can get a timeout failure here, as per recent report from "sungazer". Increase to 180 seconds, which is in line with our typical timeouts elsewhere in the regression tests. Back-patch to 9.6; the code looks different in 9.5, and this doesn't seem 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 parent 4399909 commit 1fac10d
Copy full SHA for 1fac10d

File tree

Expand file treeCollapse file tree

7 files changed

+7
-7
lines changed
Filter options
Expand file treeCollapse file tree

7 files changed

+7
-7
lines changed

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

Copy file name to clipboardExpand all lines: src/interfaces/ecpg/test/connect/test1.pgc
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ exec sql end declare section;
4646
exec sql connect to unix:postgresql://localhost/ecpg2_regression user regress_ecpg_user1 using "connectpw";
4747
exec sql disconnect;
4848

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;
5050
exec sql disconnect;
5151

5252
/* wrong db */

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

Copy file name to clipboardExpand all lines: src/interfaces/ecpg/test/connect/test5.pgc
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ exec sql end declare section;
5555
exec sql connect to 'unix:postgresql://localhost/ecpg2_regression' as main user :user USING "connectpw";
5656
exec sql disconnect main;
5757

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;
5959
exec sql disconnect main;
6060

6161
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

Copy file name to clipboardExpand all lines: src/interfaces/ecpg/test/expected/connect-test1-minGW32.stderr
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
[NO_PID]: sqlca: code: 0, state: 00000
4949
[NO_PID]: ecpg_finish: connection ecpg2_regression closed
5050
[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
5252
[NO_PID]: sqlca: code: 0, state: 00000
5353
[NO_PID]: ecpg_finish: connection ecpg2_regression closed
5454
[NO_PID]: sqlca: code: 0, state: 00000

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

Copy file name to clipboardExpand all lines: src/interfaces/ecpg/test/expected/connect-test1.c
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ main(void)
9393
#line 47 "test1.pgc"
9494

9595

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); }
9797
#line 49 "test1.pgc"
9898

9999
{ ECPGdisconnect(__LINE__, "CURRENT");}

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

Copy file name to clipboardExpand all lines: src/interfaces/ecpg/test/expected/connect-test1.stderr
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
[NO_PID]: sqlca: code: 0, state: 00000
4949
[NO_PID]: ecpg_finish: connection ecpg2_regression closed
5050
[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
5252
[NO_PID]: sqlca: code: 0, state: 00000
5353
[NO_PID]: ecpg_finish: connection ecpg2_regression closed
5454
[NO_PID]: sqlca: code: 0, state: 00000

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

Copy file name to clipboardExpand all lines: src/interfaces/ecpg/test/expected/connect-test5.c
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ main(void)
121121
#line 56 "test5.pgc"
122122

123123

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); }
125125
#line 58 "test5.pgc"
126126

127127
{ ECPGdisconnect(__LINE__, "main");}

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

Copy file name to clipboardExpand all lines: src/interfaces/ecpg/test/expected/connect-test5.stderr
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
[NO_PID]: sqlca: code: 0, state: 00000
6262
[NO_PID]: ecpg_finish: connection main closed
6363
[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
6565
[NO_PID]: sqlca: code: 0, state: 00000
6666
[NO_PID]: ecpg_finish: connection main closed
6767
[NO_PID]: sqlca: code: 0, state: 00000

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.