Testsuite: munge for non-dkim

[exim.git] / test / stderr / 0362

diff --git a/test/stderr/0362 b/test/stderr/0362
index 851f774f6e0320a486bb5b85b8fdf8e0f9cd5e3f..0a5dca36c1ae6285008ff2ba654b810b0072449c 100644 (file)
--- a/test/stderr/0362
+++ b/test/stderr/0362
@@ -1,22 +1,6 @@
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
@@ -38,12 +22,12 @@ host in recipient_unqualified_hosts? no (option unset)
 host in helo_verify_hosts? no (option unset)
 host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)
-list element: 
 SMTP>> 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 SMTP<< helo test
-list element: @
-list element: @[]
+test in helo_lookup_domains?
+ list element: @
+ list element: @[]
 test in helo_lookup_domains? no (end of list)
 sender_fullhost = (test) [V4NET.0.0.0]
 sender_rcvhost = [V4NET.0.0.0] (helo=test)
@@ -57,30 +41,36 @@ SMTP<< rcpt to:<x@a.b.c>
 using ACL "check_rcpt"
 processing "accept" (TESTSUITE/test-config 22)
 check domains = +local_domains
-list element: +local_domains
- start sublist local_domains
-  list element: *.test.ex
-  a.b.c in "*.test.ex"? no (end of list)
- end sublist local_domains
+a.b.c in "+local_domains"?
+ list element: +local_domains
+  start sublist local_domains
+   a.b.c in "*.test.ex"?
+   ╎list element: *.test.ex
+   a.b.c in "*.test.ex"? no (end of list)
+  end sublist local_domains
 a.b.c in "+local_domains"? no (end of list)
 accept: condition test failed in ACL "check_rcpt"
 processing "accept" (TESTSUITE/test-config 23)
 check domains = +relay_domains
-list element: +relay_domains
- start sublist relay_domains
-  list element: a.b.c
-  a.b.c in "a.b.c"? yes (matched "a.b.c")
- end sublist relay_domains
-data from lookup saved for cache for +relay_domains: key 'a.b.c' value 'a.b.c'
-a.b.c in "+relay_domains"? yes (matched "+relay_domains")
+a.b.c in "+relay_domains"?
+ list element: +relay_domains
+  start sublist relay_domains
+   a.b.c in "a.b.c"?
+   ╎list element: a.b.c
+   ╎a.b.c in "a.b.c"? yes (matched "a.b.c")
+  end sublist relay_domains
+ data from lookup saved for cache for +relay_domains: key 'a.b.c' value 'a.b.c'
+ a.b.c in "+relay_domains"? yes (matched "+relay_domains")
 check verify = recipient
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Verifying x@a.b.c
-list element: x@a.b.c
-address match test: subject=x@a.b.c pattern=x@a.b.c
-list element: a.b.c
-a.b.c in "a.b.c"? yes (matched "a.b.c")
-x@a.b.c in "x@a.b.c"? yes (matched "x@a.b.c")
+x@a.b.c in "x@a.b.c"?
+ list element: x@a.b.c
+ address match test: subject=x@a.b.c pattern=x@a.b.c
+ a.b.c in "a.b.c"?
+  list element: a.b.c
+  a.b.c in "a.b.c"? yes (matched "a.b.c")
+ x@a.b.c in "x@a.b.c"? yes (matched "x@a.b.c")
 LOG: address_rewrite MAIN
   "x@a.b.c" from env-to rewritten as "x@x.test.ex" by rule 1
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -90,23 +80,27 @@ routing x@x.test.ex
 --------> r1 router <--------
 local_part=x domain=x.test.ex
 checking domains
-list element: +relay_domains
- start sublist relay_domains
-  list element: a.b.c
-  x.test.ex in "a.b.c"? no (end of list)
- end sublist relay_domains
-x.test.ex in "+relay_domains"? no (end of list)
+x.test.ex in domains?
+ list element: +relay_domains
+  start sublist relay_domains
+   x.test.ex in "a.b.c"?
+   ╎list element: a.b.c
+   x.test.ex in "a.b.c"? no (end of list)
+  end sublist relay_domains
+x.test.ex in domains? no (end of list)
 r1 router skipped: domains mismatch
 --------> r2 router <--------
 local_part=x domain=x.test.ex
 checking domains
-list element: +local_domains
- start sublist local_domains
-  list element: *.test.ex
-  x.test.ex in "*.test.ex"? yes (matched "*.test.ex")
- end sublist local_domains
-data from lookup saved for cache for +local_domains: key 'x.test.ex' value '*.test.ex'
-x.test.ex in "+local_domains"? yes (matched "+local_domains")
+x.test.ex in domains?
+ list element: +local_domains
+  start sublist local_domains
+   x.test.ex in "*.test.ex"?
+   ╎list element: *.test.ex
+   ╎x.test.ex in "*.test.ex"? yes (matched "*.test.ex")
+  end sublist local_domains
+ data from lookup saved for cache for +local_domains: key 'x.test.ex' value '*.test.ex'
+ x.test.ex in domains? yes (matched "+local_domains")
 calling r2 router
 r2 router called for x@x.test.ex
   domain = x.test.ex
@@ -125,6 +119,6 @@ SMTP>> 250 Accepted
 SMTP<< quit
 SMTP>> 221 the.local.host.name closing connection
 LOG: smtp_connection MAIN
-  SMTP connection from (test) [V4NET.0.0.0] closed by QUIT
+  SMTP connection from (test) [V4NET.0.0.0] D=qqs closed by QUIT
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>