Testsuite: case-number shuffling

[users/heiko/exim.git] / test / stderr / 2200

diff --git a/test/stderr/2200 b/test/stderr/2200
index a1953b2686307a7401d325cc2d69067a966922cf..9631e9b82273c247f0f2345f836604615009ac82 100644 (file)
--- a/test/stderr/2200
+++ b/test/stderr/2200
@@ -4,27 +4,25 @@ admin user
 dropping to exim gid; retaining priv uid
  search_open: dnsdb "NULL"
  search_find: file="NULL"
 dropping to exim gid; retaining priv uid
  search_open: dnsdb "NULL"
  search_find: file="NULL"

-   key="a=localhost.test.ex" partial=-1 affix=NULL starflags=0
+   key="a=localhost.test.ex" partial=-1 affix=NULL starflags=0 opts=NULL

  LRU list:
  internal_search_find: file="NULL"
  LRU list:
  internal_search_find: file="NULL"

-   type=dnsdb key="a=localhost.test.ex"
+   type=dnsdb key="a=localhost.test.ex" opts=NULL

  database lookup required for a=localhost.test.ex
  dnsdb key: localhost.test.ex
  database lookup required for a=localhost.test.ex
  dnsdb key: localhost.test.ex

-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+ creating new cache entry

  lookup yielded: 127.0.0.1
  search_open: dnsdb "NULL"
    cached open
  search_find: file="NULL"
  lookup yielded: 127.0.0.1
  search_open: dnsdb "NULL"
    cached open
  search_find: file="NULL"

-   key="a=localhost.test.ex" partial=-1 affix=NULL starflags=0
+   key="a=localhost.test.ex" partial=-1 affix=NULL starflags=0 opts=NULL

  LRU list:
  internal_search_find: file="NULL"
  LRU list:
  internal_search_find: file="NULL"

-   type=dnsdb key="a=localhost.test.ex"
+   type=dnsdb key="a=localhost.test.ex" opts=NULL

  cached data used for lookup of a=localhost.test.ex
  lookup yielded: 127.0.0.1
 search_tidyup called
  cached data used for lookup of a=localhost.test.ex
  lookup yielded: 127.0.0.1
 search_tidyup called

->>>>>>>>>>>>>>>> Exim pid=pppp (main: expansion test) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>

 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user


@@ -32,31 +30,27 @@ search_tidyup called
 search_tidyup called
   search_open: dnsdb "NULL"
   search_find: file="NULL"
 search_tidyup called
   search_open: dnsdb "NULL"
   search_find: file="NULL"

-    key="a=shorthost.test.ex" partial=-1 affix=NULL starflags=0
+    key="a=shorthost.test.ex" partial=-1 affix=NULL starflags=0 opts=NULL

   LRU list:
   internal_search_find: file="NULL"
   LRU list:
   internal_search_find: file="NULL"

-    type=dnsdb key="a=shorthost.test.ex"
+    type=dnsdb key="a=shorthost.test.ex" opts=NULL

   database lookup required for a=shorthost.test.ex
   dnsdb key: shorthost.test.ex
   database lookup required for a=shorthost.test.ex
   dnsdb key: shorthost.test.ex

-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+  creating new cache entry

   lookup yielded: 127.0.0.1
   search_open: dnsdb "NULL"
     cached open
   search_find: file="NULL"
   lookup yielded: 127.0.0.1
   search_open: dnsdb "NULL"
     cached open
   search_find: file="NULL"

-    key="a=shorthost.test.ex" partial=-1 affix=NULL starflags=0
+    key="a=shorthost.test.ex" partial=-1 affix=NULL starflags=0 opts=NULL

   LRU list:
   internal_search_find: file="NULL"
   LRU list:
   internal_search_find: file="NULL"

-    type=dnsdb key="a=shorthost.test.ex"
-  cached data found but past valid time;   database lookup required for a=shorthost.test.ex
+    type=dnsdb key="a=shorthost.test.ex" opts=NULL
+  cached data found but out-of-date;   database lookup required for a=shorthost.test.ex

   dnsdb key: shorthost.test.ex
   dnsdb key: shorthost.test.ex

-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
+  replacing old cache entry

   lookup yielded: 127.0.0.1
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 search_tidyup called
   lookup yielded: 127.0.0.1
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 search_tidyup called

->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>