git://git.exim.org / exim.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Testsuite: munge for error message sizes in retry records
[exim.git] / test / stderr / 2201
diff --git a/test/stderr/2201 b/test/stderr/2201
index edd4186a4e331d1f7b922a410f276296186f3b2b..eb37f80cbb805a58cfb2faac1f750ff6ae75e65d 100644 (file)
--- a/test/stderr/2201
+++ b/test/stderr/2201
@@ -1,33 +1,9 @@
 Exim version x.yz ....
+Hints DB:
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1236
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
-SHELL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-EXIM_TEST_NUMBER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PWD in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-TERM in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-USER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-SHLVL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
-_ in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
@@ -46,15 +22,15 @@ routing test.ex@test.ex
 --------> r0 router <--------
 local_part=test.ex domain=test.ex
 checking senders
-CALLER@myhost.test.ex in "a@shorthost.test.ex"?
+CALLER@myhost.test.ex in senders?
  list element: a@shorthost.test.ex
  address match test: subject=CALLER@myhost.test.ex pattern=a@shorthost.test.ex
-CALLER@myhost.test.ex in "a@shorthost.test.ex"? no (end of list)
+CALLER@myhost.test.ex in senders? no (end of list)
 r0 router skipped: senders mismatch
 --------> r1 router <--------
 local_part=test.ex domain=test.ex
 checking domains
-test.ex in "dnsdb;test.ex"?
+test.ex in domains?
  list element: dnsdb;test.ex
  search_open: dnsdb "NULL"
  search_find: file="NULL"
@@ -65,13 +41,13 @@ test.ex in "dnsdb;test.ex"?
  database lookup required for test.ex
                               (tainted)
  dnsdb key: test.ex
-DNS lookup of test.ex (TXT) using fakens
-DNS lookup of test.ex (TXT) succeeded
+ DNS lookup of test.ex (TXT) using fakens
+ DNS lookup of test.ex (TXT) succeeded
  creating new cache entry
- lookup yielded: A TXT record for test.ex.
- test.ex in "dnsdb;test.ex"? yes (matched "dnsdb;test.ex")
+ lookup yielded: A░TXT░record░for░test.ex.
+ test.ex in domains? yes (matched "dnsdb;test.ex")
 checking local_parts
-test.ex in "dnsdb;test.ex"?
+test.ex in local_parts?
  list element: dnsdb;test.ex
  search_open: dnsdb "NULL"
    cached open
@@ -81,8 +57,8 @@ test.ex in "dnsdb;test.ex"?
  internal_search_find: file="NULL"
    type=dnsdb key="test.ex" opts=NULL
  cached data used for lookup of test.ex
- lookup yielded: A TXT record for test.ex.
- test.ex in "dnsdb;test.ex"? yes (matched "dnsdb;test.ex")
+ lookup yielded: A░TXT░record░for░test.ex.
+ test.ex in local_parts? yes (matched "dnsdb;test.ex")
 calling r1 router
 r1 router called for test.ex@test.ex
   domain = test.ex
@@ -103,15 +79,15 @@ routing unknown@test.ex
 --------> r0 router <--------
 local_part=unknown domain=test.ex
 checking senders
-CALLER@myhost.test.ex in "a@shorthost.test.ex"?
+CALLER@myhost.test.ex in senders?
  list element: a@shorthost.test.ex
  address match test: subject=CALLER@myhost.test.ex pattern=a@shorthost.test.ex
-CALLER@myhost.test.ex in "a@shorthost.test.ex"? no (end of list)
+CALLER@myhost.test.ex in senders? no (end of list)
 r0 router skipped: senders mismatch
 --------> r1 router <--------
 local_part=unknown domain=test.ex
 checking domains
-test.ex in "dnsdb;test.ex"?
+test.ex in domains?
  list element: dnsdb;test.ex
  search_open: dnsdb "NULL"
    cached open
@@ -121,10 +97,10 @@ test.ex in "dnsdb;test.ex"?
  internal_search_find: file="NULL"
    type=dnsdb key="test.ex" opts=NULL
  cached data used for lookup of test.ex
- lookup yielded: A TXT record for test.ex.
- test.ex in "dnsdb;test.ex"? yes (matched "dnsdb;test.ex")
+ lookup yielded: A░TXT░record░for░test.ex.
+ test.ex in domains? yes (matched "dnsdb;test.ex")
 checking local_parts
-unknown in "dnsdb;unknown"?
+unknown in local_parts?
  list element: dnsdb;unknown
  search_open: dnsdb "NULL"
    cached open
@@ -136,19 +112,19 @@ unknown in "dnsdb;unknown"?
  database lookup required for unknown
                               (tainted)
  dnsdb key: unknown
-DNS lookup of unknown (TXT) using fakens
-DNS lookup of unknown (TXT) gave HOST_NOT_FOUND
-returning DNS_NOMATCH
-faking res_search(TXT) response length as 65535
- writing neg-cache entry for unknown-TXT-xxxx, ttl 3000
+ DNS lookup of unknown (TXT) using fakens
+ DNS lookup of unknown (TXT) gave HOST_NOT_FOUND
+ returning DNS_NOMATCH
+ faking res_search(TXT) response length as 65535
+  writing neg-cache entry for unknown-TXT-xxxx, ttl 3000
  creating new cache entry
  lookup failed
-unknown in "dnsdb;unknown"? no (end of list)
+unknown in local_parts? no (end of list)
 r1 router skipped: local_parts mismatch
 --------> r2 router <--------
 local_part=unknown domain=test.ex
 checking domains
-test.ex in "dnsdb;test.ex"?
+test.ex in domains?
  list element: dnsdb;test.ex
  search_open: dnsdb "NULL"
    cached open
@@ -158,10 +134,10 @@ test.ex in "dnsdb;test.ex"?
  internal_search_find: file="NULL"
    type=dnsdb key="test.ex" opts=NULL
  cached data used for lookup of test.ex
- lookup yielded: A TXT record for test.ex.
- test.ex in "dnsdb;test.ex"? yes (matched "dnsdb;test.ex")
+ lookup yielded: A░TXT░record░for░test.ex.
+ test.ex in domains? yes (matched "dnsdb;test.ex")
 checking senders
-CALLER@myhost.test.ex in "dnsdb;A=myhost.test.ex"?
+CALLER@myhost.test.ex in senders?
  list element: dnsdb;A=myhost.test.ex
  address match test: subject=CALLER@myhost.test.ex pattern=dnsdb;A=myhost.test.ex
  search_open: dnsdb "NULL"
@@ -173,11 +149,11 @@ CALLER@myhost.test.ex in "dnsdb;A=myhost.test.ex"?
    type=dnsdb key="A=myhost.test.ex" opts=NULL
  database lookup required for A=myhost.test.ex
  dnsdb key: myhost.test.ex
-DNS lookup of myhost.test.ex (A) using fakens
-DNS lookup of myhost.test.ex (A) succeeded
+ DNS lookup of myhost.test.ex (A) using fakens
+ DNS lookup of myhost.test.ex (A) succeeded
  creating new cache entry
  lookup yielded: V4NET.10.10.10
- CALLER@myhost.test.ex in "dnsdb;A=myhost.test.ex"? yes (matched "dnsdb;A=myhost.test.ex")
+ CALLER@myhost.test.ex in senders? yes (matched "dnsdb;A=myhost.test.ex")
 calling r2 router
 r2 router called for unknown@test.ex
   domain = test.ex
@@ -192,6 +168,7 @@ routed by r2 router
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
+Hints DB:
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
@@ -237,6 +214,7 @@ search_tidyup called
 
 ******** SERVER ********
 Exim version x.yz ....
+Hints DB:
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
@@ -256,6 +234,7 @@ p1238 Process p1238 is handling incoming connection from [127.0.0.1]
 p1238 Process p1238 is ready for new message
 1 SMTP accept process running
 Listening...
+p1238 host in chunking_advertise_hosts? no (end of list)
 p1238 dnslists check: rbl.test.ex/V4NET.11.12.14
 p1238 new DNS lookup for 14.12.11.V4NET.rbl.test.ex
 p1238 dnslists: wrote cache entry, ttl=2
@@ -271,10 +250,10 @@ p1238 dnslists: wrote cache entry, ttl=2
 p1238 DNS lookup for 14.12.11.V4NET.rbl.test.ex succeeded (yielding 127.0.0.2)
 p1238 => that means V4NET.11.12.14 is listed at rbl.test.ex
 LOG: MAIN
-  <= a@shorthost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmaX-0005vi-00@myhost.test.ex
+  <= a@shorthost.test.ex H=localhost (myhost.test.ex) [127.0.0.1] P=esmtp S=sss id=E10HmaX-000000005vi-0000@myhost.test.ex
 Process p1238 is ready for new message
 LOG: smtp_connection MAIN
-  SMTP connection from localhost (myhost.test.ex) [127.0.0.1] closed by QUIT
+  SMTP connection from localhost (myhost.test.ex) [127.0.0.1] D=qqs closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=p1238 (daemon-accept) terminating with rc=0 >>>>>>>>>>>>>>>>
 p1235 child p1238 ended: status=0x0
 p1235   normal exit, 0
Master Exim source repository