Testsuite: increase default "client" utility connect timeout from 1 to 5 seconds

diff --git a/test/scripts/0000-Basic/0035 b/test/scripts/0000-Basic/0035
index d0805bdeec8c833fd10414195cc059fc83d2a6a0..147c8e7e250b1f3f5becb87b6e2694992f2c302e 100644 (file)
--- a/test/scripts/0000-Basic/0035
+++ b/test/scripts/0000-Basic/0035
@@ -3,7 +3,7 @@ need_ipv4
 #
 exim -DSERVER=server -bd -oX PORT_D
 ****
 #
 exim -DSERVER=server -bd -oX PORT_D
 ****

-client -t5 127.0.0.1 PORT_D
+client 127.0.0.1 PORT_D

 ??? 220
 ehlo rhu.barb
 ??? 250-
 ??? 220
 ehlo rhu.barb
 ??? 250-


@@ -61,7 +61,7 @@ killdaemon
 millisleep 500
 exim -DSERVER=server -DSUBMISSION_OPTIONS=/domain=a.b.c/sender_retain -bd -oX PORT_D
 ****
 millisleep 500
 exim -DSERVER=server -DSUBMISSION_OPTIONS=/domain=a.b.c/sender_retain -bd -oX PORT_D
 ****

-client -t5 127.0.0.1 PORT_D
+client 127.0.0.1 PORT_D

 ??? 220
 ehlo rhu.barb
 ??? 250-
 ??? 220
 ehlo rhu.barb
 ??? 250-


@@ -86,7 +86,7 @@ killdaemon
 millisleep 500
 exim -DSERVER=server -DSUBMISSION_OPTIONS=/domain=a.b.c/name=SomeName -bd -oX PORT_D
 ****
 millisleep 500
 exim -DSERVER=server -DSUBMISSION_OPTIONS=/domain=a.b.c/name=SomeName -bd -oX PORT_D
 ****

-client -t5 127.0.0.1 PORT_D
+client 127.0.0.1 PORT_D

 ??? 220
 ehlo rhu.barb
 ??? 250-
 ??? 220
 ehlo rhu.barb
 ??? 250-

diff --git a/test/src/client.c b/test/src/client.c
index 4efe43fc361e567902bd680c2ae7397133c8d4fd..614c2c557b16bd8d8539d69b81d20cf48a3ebee9 100644 (file)
--- a/test/src/client.c
+++ b/test/src/client.c
@@ -489,7 +489,7 @@ char *keyfile = NULL;
 char *end = NULL;
 int argi = 1;
 int host_af, port, s_len, rc, sock, save_errno;
 char *end = NULL;
 int argi = 1;
 int host_af, port, s_len, rc, sock, save_errno;

-int timeout = 1;
+int timeout = 5;

 int tls_active = 0;
 int sent_starttls = 0;
 int tls_on_connect = 0;
 int tls_active = 0;
 int sent_starttls = 0;
 int tls_on_connect = 0;