diff options
| -rwxr-xr-x | test/runtest | 17 | ||||
| -rw-r--r-- | test/scripts/3450-plaintext-GnuTLS/3450 | 3 | ||||
| -rw-r--r-- | test/scripts/3450-plaintext-GnuTLS/3453 | 2 | ||||
| -rw-r--r-- | test/scripts/3450-plaintext-GnuTLS/3454 | 41 | ||||
| -rw-r--r-- | test/stdout/3450 | 6 | ||||
| -rw-r--r-- | test/stdout/3453 | 4 | ||||
| -rw-r--r-- | test/stdout/3454 | 44 |
7 files changed, 75 insertions, 42 deletions
diff --git a/test/runtest b/test/runtest index d42d400a9..8f5d9b60c 100755 --- a/test/runtest +++ b/test/runtest @@ -3200,10 +3200,10 @@ foreach $test (@test_list) for (;;) { - print "\nshow stdErr, show stdOut, Continue (without file comparison), or Quit? [Q] "; + print "\nshow stdErr, show stdOut, Retry, Continue (without file comparison), or Quit? [Q] "; $_ = <T>; tests_exit(1) if /^q?$/i; - last if /^c$/i; + last if /^[rc]$/i; if (/^e$/i) { system("$more test-stderr"); @@ -3214,6 +3214,7 @@ foreach $test (@test_list) } } + $retry = 1 if /^r$/i; $docheck = 0; } @@ -3236,10 +3237,10 @@ foreach $test (@test_list) for (;;) { - print "\nShow server stdout, Continue, or Quit? [Q] "; + print "\nShow server stdout, Retry, Continue, or Quit? [Q] "; $_ = <T>; tests_exit(1) if /^q?$/i; - last if /^c$/i; + last if /^[rc]$/i; if (/^s$/i) { @@ -3249,6 +3250,7 @@ foreach $test (@test_list) close(S); } } + $retry = 1 if /^r$/i; } } } @@ -3259,6 +3261,13 @@ foreach $test (@test_list) # function returns 0 if all is well, 1 if we should rerun the test (the files # have been updated). It does not return if the user responds Q to a prompt. + if ($retry) + { + $retry = '0'; + print (("#" x 79) . "\n"); + redo; + } + if ($docheck) { if (check_output() != 0) diff --git a/test/scripts/3450-plaintext-GnuTLS/3450 b/test/scripts/3450-plaintext-GnuTLS/3450 index bb50a3e9c..0494118ca 100644 --- a/test/scripts/3450-plaintext-GnuTLS/3450 +++ b/test/scripts/3450-plaintext-GnuTLS/3450 @@ -10,6 +10,7 @@ ehlo foobar ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 auth plain AHVzZXJ4AHNlY3JldA== ??? 235 @@ -24,6 +25,7 @@ ehlo foobar ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 auth plain AHVzZXJ4AHNlY3JldA== ??? 503 @@ -34,6 +36,7 @@ ehlo foobar ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 auth plain AHVzZXJ4AHNlY3JldA== ??? 235 diff --git a/test/scripts/3450-plaintext-GnuTLS/3453 b/test/scripts/3450-plaintext-GnuTLS/3453 index cf99cd896..a88f49f3d 100644 --- a/test/scripts/3450-plaintext-GnuTLS/3453 +++ b/test/scripts/3450-plaintext-GnuTLS/3453 @@ -10,6 +10,7 @@ ehlo foobar ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 starttls ??? 220 @@ -31,6 +32,7 @@ ehlo foobar ??? 250- ??? 250- ??? 250- +??? 250- ??? 250 starttls ??? 220 diff --git a/test/scripts/3450-plaintext-GnuTLS/3454 b/test/scripts/3450-plaintext-GnuTLS/3454 index 0c45cbcc5..7ef007707 100644 --- a/test/scripts/3450-plaintext-GnuTLS/3454 +++ b/test/scripts/3450-plaintext-GnuTLS/3454 @@ -5,34 +5,37 @@ exim -DSERVER=server -bd -oX PORT_D client-ssl 127.0.0.1 PORT_D ??? 220 ehlo foobar -??? 250- -??? 250- -??? 250- -??? 250- -??? 250- -??? 250 +??? 250-myhost +??? 250-SIZE +??? 250-8BITMIME +??? 250-PIPELINING +??? 250-AUTH +??? 250-STARTTLS +??? 250 HELP starttls -??? 220 +??? 220 TLS auth plain AHVzZXJ4AHNlY3JldA== ??? 503 **** client-ssl 127.0.0.1 PORT_D ??? 220 ehlo foobar -??? 250- -??? 250- -??? 250- -??? 250- -??? 250- -??? 250 +??? 250-myhost +??? 250-SIZE +??? 250-8BITMIME +??? 250-PIPELINING +??? 250-AUTH +??? 250-STARTTLS +??? 250 HELP starttls -??? 220 +??? 220 TLS ehlo foobar -??? 250- -??? 250- -??? 250- -??? 250- -??? 250 +??? 250-myhost +??? 250-SIZE +??? 250-8BITMIME +??? 250-PIPELINING +??? 250-AUTH +??? 250 HELP auth plain AHVzZXJ4AHNlY3JldA== ??? 235 quit diff --git a/test/stdout/3450 b/test/stdout/3450 index 04dd751a8..3c2ee8a31 100644 --- a/test/stdout/3450 +++ b/test/stdout/3450 @@ -7,6 +7,8 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected ??? 250- <<< 250-SIZE 52428800 ??? 250- +<<< 250-8BITMIME +??? 250- <<< 250-PIPELINING ??? 250- <<< 250-AUTH PLAIN @@ -30,6 +32,8 @@ Connecting to 127.0.0.1 port 1225 ... connected ??? 250- <<< 250-SIZE 52428800 ??? 250- +<<< 250-8BITMIME +??? 250- <<< 250-PIPELINING ??? 250- <<< 250-AUTH PLAIN @@ -66,6 +70,8 @@ Succeeded in starting TLS ??? 250- <<< 250-SIZE 52428800 ??? 250- +<<< 250-8BITMIME +??? 250- <<< 250-PIPELINING ??? 250- <<< 250-AUTH PLAIN diff --git a/test/stdout/3453 b/test/stdout/3453 index e2186de39..098973d42 100644 --- a/test/stdout/3453 +++ b/test/stdout/3453 @@ -7,6 +7,8 @@ Connecting to 127.0.0.1 port 1225 ... connected ??? 250- <<< 250-SIZE 52428800 ??? 250- +<<< 250-8BITMIME +??? 250- <<< 250-PIPELINING ??? 250- <<< 250-AUTH PLAIN @@ -38,6 +40,8 @@ Connecting to 127.0.0.1 port 1225 ... connected ??? 250- <<< 250-SIZE 52428800 ??? 250- +<<< 250-8BITMIME +??? 250- <<< 250-PIPELINING ??? 250- <<< 250-AUTH PLAIN diff --git a/test/stdout/3454 b/test/stdout/3454 index 7ccebbc84..1deec37c5 100644 --- a/test/stdout/3454 +++ b/test/stdout/3454 @@ -2,20 +2,22 @@ Connecting to 127.0.0.1 port 1225 ... connected ??? 220 <<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 >>> ehlo foobar -??? 250- +??? 250-myhost <<< 250-myhost.test.ex Hello foobar [127.0.0.1] -??? 250- +??? 250-SIZE <<< 250-SIZE 52428800 -??? 250- +??? 250-8BITMIME +<<< 250-8BITMIME +??? 250-PIPELINING <<< 250-PIPELINING -??? 250- +??? 250-AUTH <<< 250-AUTH PLAIN -??? 250- +??? 250-STARTTLS <<< 250-STARTTLS -??? 250 +??? 250 HELP <<< 250 HELP >>> starttls -??? 220 +??? 220 TLS <<< 220 TLS go ahead Attempting to start TLS SSL info: before/connect initialization @@ -42,20 +44,22 @@ Connecting to 127.0.0.1 port 1225 ... connected ??? 220 <<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 >>> ehlo foobar -??? 250- +??? 250-myhost <<< 250-myhost.test.ex Hello foobar [127.0.0.1] -??? 250- +??? 250-SIZE <<< 250-SIZE 52428800 -??? 250- +??? 250-8BITMIME +<<< 250-8BITMIME +??? 250-PIPELINING <<< 250-PIPELINING -??? 250- +??? 250-AUTH <<< 250-AUTH PLAIN -??? 250- +??? 250-STARTTLS <<< 250-STARTTLS -??? 250 +??? 250 HELP <<< 250 HELP >>> starttls -??? 220 +??? 220 TLS <<< 220 TLS go ahead Attempting to start TLS SSL info: before/connect initialization @@ -75,15 +79,17 @@ SSL info: SSL negotiation finished successfully SSL connection using DHE-RSA-AES256-SHA Succeeded in starting TLS >>> ehlo foobar -??? 250- +??? 250-myhost <<< 250-myhost.test.ex Hello foobar [127.0.0.1] -??? 250- +??? 250-SIZE <<< 250-SIZE 52428800 -??? 250- +??? 250-8BITMIME +<<< 250-8BITMIME +??? 250-PIPELINING <<< 250-PIPELINING -??? 250- +??? 250-AUTH <<< 250-AUTH PLAIN -??? 250 +??? 250 HELP <<< 250 HELP >>> auth plain AHVzZXJ4AHNlY3JldA== ??? 235 |