Testsuite: sort output of retry DB dumps

Different systems will have dump output in different order
so to tidy up the Solaris runs, sort pairs of lines by the
leading "word".

diff --git a/test/runtest b/test/runtest
index 0eda52d91c031e8cc4d633d15a46bb3c1e76eb7f..9fd8188793626266a7d87dc8d544c36f4223131e 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -1666,19 +1666,42 @@ if (/^dump\s+(\S+)/)
   my(@temp);
   print ">> ./eximdir/exim_dumpdb $parm_cwd/spool $which\n" if $debug;
   open(IN, "./eximdir/exim_dumpdb $parm_cwd/spool $which |");
-  @temp = <IN>;
-  close(IN);
-  if ($which eq "callout")
+  open(OUT, ">>test-stdout");
+  print OUT "+++++++++++++++++++++++++++\n";
+
+  if ($which eq "retry")
     {
+    $/ = "\n  ";
+    @temp = <IN>;
+    $/ = "\n";
+
     @temp = sort {
-                 my($aa) = substr $a, 21;
-                 my($bb) = substr $b, 21;
-                 return $aa cmp $bb;
+                   my($aa) = split(' ', $a);
+                   my($bb) = split(' ', $b);
+                   return $aa cmp $bb;
                  } @temp;
+
+    foreach $item (@temp)
+      {
+      $item =~ s/^\s*(.*)\n(.*)\n?\s*$/\1\n\2/m;
+      print OUT "  $item\n";
+      }
     }
-  open(OUT, ">>test-stdout");
-  print OUT "+++++++++++++++++++++++++++\n";
-  print OUT @temp;
+  else
+    {
+    @temp = <IN>;
+    if ($which eq "callout")
+      {
+      @temp = sort {
+                   my($aa) = substr $a, 21;
+                   my($bb) = substr $b, 21;
+                   return $aa cmp $bb;
+                   } @temp;
+      }
+    print OUT @temp;
+    }
+
+  close(IN);
   close(OUT);
   return 1;
   }

diff --git a/test/stdout/0099 b/test/stdout/0099
index e9272baa6eb29dc53c14188bca67f3015e40c720..a1b59f986f2a6eb76353a9b7d4c1dd13615649d7 100644 (file)
--- a/test/stdout/0099
+++ b/test/stdout/0099
@@ -15,10 +15,10 @@ first failed = time last try = time2 next try = time2 + 900
   T:localhost.test.ex:127.0.0.1:999 dd 65 Connection refused
 first failed = time last try = time2 next try = time2 + 900
   T:localhost.test.ex:::1:999 dd 65 Connection refused
-first failed = time last try = time2 next try = time2 + 900
-  T:thishost.test.ex:999 dd 65 Connection refused
 first failed = time last try = time2 next try = time2 + 900
   T:thishost.test.ex:127.0.0.1:999 dd 65 Connection refused
+first failed = time last try = time2 next try = time2 + 900
+  T:thishost.test.ex:999 dd 65 Connection refused
 first failed = time last try = time2 next try = time2 + 900
 Retry rule: *.star.ex  *  F,3d,10m; 
 Retry rule: lsearch*@;TESTSUITE/aux-fixed/0099.rlist  *  F,1d,3m; 

diff --git a/test/stdout/0195 b/test/stdout/0195
index 991c273f3e1044e57c72bc3569d0fe10108a3e0b..4059a23a99e09f19b9743d8008abc4d37bec59be 100644 (file)
--- a/test/stdout/0195
+++ b/test/stdout/0195
@@ -1,23 +1,23 @@
 +++++++++++++++++++++++++++
   R:userx@myhost.test.ex -1 0 forcibly deferred
-first failed = time last try = time2 next try = time2 + 10
-  R:userz@myhost.test.ex -1 0 forcibly deferred
 first failed = time last try = time2 next try = time2 + 10
   R:usery@myhost.test.ex -1 0 forcibly deferred
+first failed = time last try = time2 next try = time2 + 10
+  R:userz@myhost.test.ex -1 0 forcibly deferred
 first failed = time last try = time2 next try = time2 + 10
 +++++++++++++++++++++++++++
   R:userx@myhost.test.ex -1 0 forcibly deferred
-first failed = time last try = time2 next try = time2 + 10
-  R:userz@myhost.test.ex -1 0 forcibly deferred
 first failed = time last try = time2 next try = time2 + 10
   R:usery@myhost.test.ex -1 0 forcibly deferred
+first failed = time last try = time2 next try = time2 + 10
+  R:userz@myhost.test.ex -1 0 forcibly deferred
 first failed = time last try = time2 next try = time2 + 10
 +++++++++++++++++++++++++++
   R:userx@myhost.test.ex -1 0 forcibly deferred
-first failed = time last try = time2 next try = time2 + 10
-  R:userz@myhost.test.ex -1 0 forcibly deferred
 first failed = time last try = time2 next try = time2 + 10
   R:usery@myhost.test.ex -1 0 forcibly deferred
+first failed = time last try = time2 next try = time2 + 10
+  R:userz@myhost.test.ex -1 0 forcibly deferred
 first failed = time last try = time2 next try = time2 + 10
 +++++++++++++++++++++++++++
   R:userx@myhost.test.ex -1 0 forcibly deferred
@@ -26,8 +26,8 @@ first failed = time last try = time2 next try = time2 + 10
 first failed = time last try = time2 next try = time2 + 10
 +++++++++++++++++++++++++++
   R:userx@myhost.test.ex -1 0 forcibly deferred
-first failed = time last try = time2 next try = time2 + 10
-  R:userz@myhost.test.ex -1 0 forcibly deferred
 first failed = time last try = time2 next try = time2 + 10
   R:usery@myhost.test.ex -1 0 forcibly deferred
+first failed = time last try = time2 next try = time2 + 10
+  R:userz@myhost.test.ex -1 0 forcibly deferred
 first failed = time last try = time2 next try = time2 + 10

diff --git a/test/stdout/0264 b/test/stdout/0264
index a6c9f39614567d56f6cfd642d10b38688454e7d4..48b789e6a5f2c490d4bc23005856df5943268b26 100644 (file)
--- a/test/stdout/0264
+++ b/test/stdout/0264
@@ -2,10 +2,10 @@
   T:userx@test.ex -22 xxxx mailbox is full (MTA-imposed quota exceeded while writing to TESTSUITE/test-mail/userx)
 first failed = time last try = time2 next try = time2 + 600
 +++++++++++++++++++++++++++
-  T:userx@test.ex -22 xxxx mailbox is full (MTA-imposed quota exceeded while writing to TESTSUITE/test-mail/userx)
-first failed = time last try = time2 next try = time2 + 600
   T:test.ex -22 xxxx mailbox is full (MTA-imposed quota exceeded while writing to TESTSUITE/test-mail/notuser)
 first failed = time last try = time2 next try = time2 + 1200
+  T:userx@test.ex -22 xxxx mailbox is full (MTA-imposed quota exceeded while writing to TESTSUITE/test-mail/userx)
+first failed = time last try = time2 next try = time2 + 600
 Message 10HmaX-0005vi-00 has been removed
 Message 10HmbA-0005vi-00 has been removed
 Message 10HmbB-0005vi-00 has been removed