X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/6fc54bd18aa7a51e11dce5a905e754cedb526230..c90c2288e88f66ae1d8af198cfa56c401e573ce4:/test/stderr/2201?ds=sidebyside

diff --git a/test/stderr/2201 b/test/stderr/2201
index edd4186a4..cc1a37aed 100644
--- a/test/stderr/2201
+++ b/test/stderr/2201
@@ -3,31 +3,6 @@ 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
@@ -68,7 +43,7 @@ test.ex in "dnsdb;test.ex"?
 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.
+ lookup yielded: A░TXT░record░for░test.ex.
  test.ex in "dnsdb;test.ex"? yes (matched "dnsdb;test.ex")
 checking local_parts
 test.ex in "dnsdb;test.ex"?
@@ -81,7 +56,7 @@ 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.
+ lookup yielded: A░TXT░record░for░test.ex.
  test.ex in "dnsdb;test.ex"? yes (matched "dnsdb;test.ex")
 calling r1 router
 r1 router called for test.ex@test.ex
@@ -121,7 +96,7 @@ 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.
+ lookup yielded: A░TXT░record░for░test.ex.
  test.ex in "dnsdb;test.ex"? yes (matched "dnsdb;test.ex")
 checking local_parts
 unknown in "dnsdb;unknown"?
@@ -158,7 +133,7 @@ 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.
+ lookup yielded: A░TXT░record░for░test.ex.
  test.ex in "dnsdb;test.ex"? yes (matched "dnsdb;test.ex")
 checking senders
 CALLER@myhost.test.ex in "dnsdb;A=myhost.test.ex"?
@@ -271,10 +246,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