Testsuite: support "anything but" returncode script lines

[exim.git] / test / stderr / 0381

diff --git a/test/stderr/0381 b/test/stderr/0381
index 0219ec4cca1e58020768bf16bc2ce474c707763d..550e2dab977b96267206270e42aefc5ceec12668 100644 (file)
--- a/test/stderr/0381
+++ b/test/stderr/0381
@@ -28,6 +28,9 @@ host in helo_accept_junk_hosts? no (option unset)
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 SMTP<< helo test
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 SMTP<< helo test

+test in helo_lookup_domains?
+ list element: @
+ list element: @[]

 test in helo_lookup_domains? no (end of list)
 sender_fullhost = (test) [V4NET.99.99.97]
 sender_rcvhost = [V4NET.99.99.97] (helo=test ident=CALLER)
 test in helo_lookup_domains? no (end of list)
 sender_fullhost = (test) [V4NET.99.99.97]
 sender_rcvhost = [V4NET.99.99.97] (helo=test ident=CALLER)


@@ -41,6 +44,8 @@ SMTP<< rcpt to:<x@test.ex>
 using ACL "check_rcpt"
 processing "warn" (TESTSUITE/test-config 17)
 check hosts = *.gov.uk.test.ex
 using ACL "check_rcpt"
 processing "warn" (TESTSUITE/test-config 17)
 check hosts = *.gov.uk.test.ex

+host in "*.gov.uk.test.ex"?
+ list element: *.gov.uk.test.ex

 sender host name required, to match against *.gov.uk.test.ex
 looking up host name for V4NET.99.99.97
 DNS lookup of 97.99.99.V4NET.in-addr.arpa (PTR) using fakens
 sender host name required, to match against *.gov.uk.test.ex
 looking up host name for V4NET.99.99.97
 DNS lookup of 97.99.99.V4NET.in-addr.arpa (PTR) using fakens


@@ -62,19 +67,25 @@ Forward DNS security status: unverified
 sender_fullhost = x.gov.uk.test.ex (test) [V4NET.99.99.97]
 sender_rcvhost = x.gov.uk.test.ex
        ([V4NET.99.99.97] helo=test ident=CALLER)
 sender_fullhost = x.gov.uk.test.ex (test) [V4NET.99.99.97]
 sender_rcvhost = x.gov.uk.test.ex
        ([V4NET.99.99.97] helo=test ident=CALLER)

-host in "*.gov.uk.test.ex"? yes (matched "*.gov.uk.test.ex")
+  host in "*.gov.uk.test.ex"? yes (matched "*.gov.uk.test.ex")

 warn: condition test succeeded in ACL "check_rcpt"
 processing "warn" (TESTSUITE/test-config 18)
 check hosts = !*.gov.uk.test.ex
 warn: condition test succeeded in ACL "check_rcpt"
 processing "warn" (TESTSUITE/test-config 18)
 check hosts = !*.gov.uk.test.ex

-host in "!*.gov.uk.test.ex"? no (matched "!*.gov.uk.test.ex")
+host in "!*.gov.uk.test.ex"?
+ list element: !*.gov.uk.test.ex
+  host in "!*.gov.uk.test.ex"? no (matched "!*.gov.uk.test.ex")

 warn: condition test failed in ACL "check_rcpt"
 processing "warn" (TESTSUITE/test-config 19)
 check hosts = *.co.uk.test.ex
 warn: condition test failed in ACL "check_rcpt"
 processing "warn" (TESTSUITE/test-config 19)
 check hosts = *.co.uk.test.ex

-host in "*.co.uk.test.ex"? yes (matched "*.co.uk.test.ex")
+host in "*.co.uk.test.ex"?
+ list element: *.co.uk.test.ex
+  host in "*.co.uk.test.ex"? yes (matched "*.co.uk.test.ex")

 warn: condition test succeeded in ACL "check_rcpt"
 processing "warn" (TESTSUITE/test-config 20)
 check hosts = !*.co.uk.test.ex
 warn: condition test succeeded in ACL "check_rcpt"
 processing "warn" (TESTSUITE/test-config 20)
 check hosts = !*.co.uk.test.ex

-host in "!*.co.uk.test.ex"? no (matched "!*.co.uk.test.ex")
+host in "!*.co.uk.test.ex"?
+ list element: !*.co.uk.test.ex
+  host in "!*.co.uk.test.ex"? no (matched "!*.co.uk.test.ex")

 warn: condition test failed in ACL "check_rcpt"
 processing "accept" (TESTSUITE/test-config 21)
 accept: condition test succeeded in ACL "check_rcpt"
 warn: condition test failed in ACL "check_rcpt"
 processing "accept" (TESTSUITE/test-config 21)
 accept: condition test succeeded in ACL "check_rcpt"


@@ -83,6 +94,6 @@ SMTP>> 250 Accepted
 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN
 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN

-  SMTP connection from CALLER closed by QUIT
+  SMTP connection from CALLER D=qqs closed by QUIT

 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>