Testsuite: sort for "seen" hints DB dumps. Bug 2833

diff --git a/test/runtest b/test/runtest
index ede05bea84cfdabc6658cd29d02538ad133800b6..8e3a1f42caefe897fa24fa2bff3167963e8fb07c 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -2316,7 +2316,7 @@ if (/^dump\s+(\S+)/)
                sort { $a->[0] cmp $b->[0] }
                #map  { [ (split)[0] =~ s/\Q$parm_ipv4/ip4.ip4.ip4.ip4/gr, $_ ] }  # this is too modern for 5.10.1
                map  {
                sort { $a->[0] cmp $b->[0] }
                #map  { [ (split)[0] =~ s/\Q$parm_ipv4/ip4.ip4.ip4.ip4/gr, $_ ] }  # this is too modern for 5.10.1
                map  {

-                (my $k = (split)[0]) =~ s/\Q$parm_ipv4/ip4.ip4.ip4.ip4/g;
+                (my $k = (split)[0]) =~ s/\Q$parm_ipv4\E/ip4.ip4.ip4.ip4/g;

                 [ $k, $_ ]
                }
                do { local $/ = "\n  "; <$in> };
                 [ $k, $_ ]
                }
                do { local $/ = "\n  "; <$in> };


@@ -2337,6 +2337,16 @@ if (/^dump\s+(\S+)/)
                    return $aa cmp $bb;
                    } @temp;
       }
                    return $aa cmp $bb;
                    } @temp;
       }

+    elsif ($which eq "seen")
+      {
+      @temp = sort {
+                  (my $aa = $a) =~ s/^([\d.]+)/$1/;
+                  (my $bb = $b) =~ s/^([\d.]+)/$1/;
+                  $aa =~ s/\Q$parm_ipv4\E/ip4.ip4.ip4.ip4/;
+                  $bb =~ s/\Q$parm_ipv4\E/ip4.ip4.ip4.ip4/;
+                   return $aa cmp $bb;
+                   } @temp;
+      }

     print $out @temp;
     }
   close($in); # close it explicitly, otherwise $? does not get set
     print $out @temp;
     }
   close($in); # close it explicitly, otherwise $? does not get set

diff --git a/test/stdout/0626 b/test/stdout/0626
index 44b481f31bde77c91bbf8160917375f44706969b..0c8ad34520f5fced09821bdd58a965dc62334505 100644 (file)
--- a/test/stdout/0626
+++ b/test/stdout/0626
@@ -41,8 +41,8 @@
 550 Administrative prohibition\r
 221 test.ex closing connection\r
 +++++++++++++++++++++++++++
 550 Administrative prohibition\r
 221 test.ex closing connection\r
 +++++++++++++++++++++++++++

-ip4.ip4.ip4.ip4        07-Mar-2000 12:21:52

 127.0.0.1      07-Mar-2000 12:21:52
 127.0.0.1      07-Mar-2000 12:21:52

+ip4.ip4.ip4.ip4        07-Mar-2000 12:21:52

 
 **** SMTP testing session as if from host 127.0.0.1
 **** but without any ident (RFC 1413) callback.
 
 **** SMTP testing session as if from host 127.0.0.1
 **** but without any ident (RFC 1413) callback.


@@ -54,9 +54,9 @@ ip4.ip4.ip4.ip4       07-Mar-2000 12:21:52
 550 Administrative prohibition\r
 221 test.ex closing connection\r
 +++++++++++++++++++++++++++
 550 Administrative prohibition\r
 221 test.ex closing connection\r
 +++++++++++++++++++++++++++

+127.0.0.1      07-Mar-2000 12:21:52

 127.0.0.1_foo  07-Mar-2000 12:21:52
 ip4.ip4.ip4.ip4        07-Mar-2000 12:21:52
 127.0.0.1_foo  07-Mar-2000 12:21:52
 ip4.ip4.ip4.ip4        07-Mar-2000 12:21:52

-127.0.0.1      07-Mar-2000 12:21:52

 
 **** SMTP testing session as if from host 127.0.0.1
 **** but without any ident (RFC 1413) callback.
 
 **** SMTP testing session as if from host 127.0.0.1
 **** but without any ident (RFC 1413) callback.