git://git.exim.org / users / heiko / exim.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: 602e025)
Testsuite: updates for 8bitmime-as-default (GnuTLS).
authorJeremy Harris <jgh146exb@wizmail.org>
Thu, 10 May 2012 21:55:58 +0000 (22:55 +0100)
committerJeremy Harris <jgh146exb@wizmail.org>
Thu, 10 May 2012 21:55:58 +0000 (22:55 +0100)
Also add Retry command to more runtest testcase-fail possibilities.

test/runtest patch | blob | history
test/scripts/3450-plaintext-GnuTLS/3450 patch | blob | history
test/scripts/3450-plaintext-GnuTLS/3453 patch | blob | history
test/scripts/3450-plaintext-GnuTLS/3454 patch | blob | history
test/stdout/3450 patch | blob | history
test/stdout/3453 patch | blob | history
test/stdout/3454 patch | blob | history

diff --git a/test/runtest b/test/runtest
index d42d400a961ad7bcba8ffdfcb354d328cfb2e8fc..8f5d9b60cf0c5c3dda3cdca8049355b5a1d1b063 100755 (executable)
--- 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 bb50a3e9c2867c6e07b22475055e90895c50c92d..0494118ca94d4afff4d1c6654b397e56c8da6d72 100644 (file)
--- 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 cf99cd8969ea3d605d299cdad99d70dcd60bed55..a88f49f3df6f834f531fa9c0ff57a30e38421cb6 100644 (file)
--- 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 0c45cbcc5c340e14f43564370a9911b22c344bbf..7ef0077076d44cc54e1d83c639776047a7af5cee 100644 (file)
--- 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 04dd751a8316678d6f166f2c4c6196bfc0ca9719..3c2ee8a31bd6108a98b552f71fd2736aaa95f4a9 100644 (file)
--- 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 e2186de39991434345e751b5229d88a06eb35fba..098973d425fe172d791d755b20f4faa7d3b423a8 100644 (file)
--- 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 7ccebbc847cfbdec46f27d3381a9dea47d4b483f..1deec37c5e7dd0895283d928eda01d6b5bc59682 100644 (file)
--- 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
Unnamed repository; edit this file 'description' to name the repository.