Add test for negated item as a retry rule pattern.

[exim.git] / test / stderr / 0371

diff --git a/test/stderr/0371 b/test/stderr/0371
index 8b212f784a99eb9bdda5dada02d24e540bd61415..8b9b8ef0bba1d2ae6c297bc4521ff79034ec4c9a 100644 (file)
--- a/test/stderr/0371
+++ b/test/stderr/0371
@@ -27,7 +27,7 @@ check set acl_c0 = $acl_c0; connect
 check set acl_c9 = $acl_c9; connect
                  = ; connect
 accept: condition test succeeded
 check set acl_c9 = $acl_c9; connect
                  = ; connect
 accept: condition test succeeded

-SMTP>> 220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+SMTP>> 220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

 smtp_setup_msg entered
 SMTP<< ehlo something
 something in helo_lookup_domains? no (end of list)
 smtp_setup_msg entered
 SMTP<< ehlo something
 something in helo_lookup_domains? no (end of list)


@@ -35,10 +35,10 @@ sender_fullhost = (something) [V4NET.0.0.0]
 sender_rcvhost = [V4NET.0.0.0] (helo=something)
 set_process_info: pppp handling incoming connection from (something) [V4NET.0.0.0]
 host in pipelining_advertise_hosts? yes (matched "*")
 sender_rcvhost = [V4NET.0.0.0] (helo=something)
 set_process_info: pppp handling incoming connection from (something) [V4NET.0.0.0]
 host in pipelining_advertise_hosts? yes (matched "*")

-SMTP>> 250-mail.test.ex Hello something [V4NET.0.0.0]\r
-250-SIZE 52428800\r
-250-PIPELINING\r
-250 HELP\r
+SMTP>> 250-mail.test.ex Hello something [V4NET.0.0.0]
+250-SIZE 52428800
+250-PIPELINING
+250 HELP

 SMTP<< mail from:<x@y>
 using ACL "mail"
 processing "accept"
 SMTP<< mail from:<x@y>
 using ACL "mail"
 processing "accept"


@@ -49,7 +49,7 @@ check set acl_c9 = $acl_c9; mail
 check set acl_m0 = $acl_m0; mail
                  = ; mail
 accept: condition test succeeded
 check set acl_m0 = $acl_m0; mail
                  = ; mail
 accept: condition test succeeded

-SMTP>> 250 OK\r
+SMTP>> 250 OK

 SMTP<< rcpt to:<x@y>
 using ACL "rcpt"
 processing "accept"
 SMTP<< rcpt to:<x@y>
 using ACL "rcpt"
 processing "accept"


@@ -60,9 +60,9 @@ check set acl_m9 = $acl_m9; rcpt
 check set acl_c0 = $acl_c0; rcpt
                  = ; connect; mail; rcpt
 accept: condition test succeeded
 check set acl_c0 = $acl_c0; rcpt
                  = ; connect; mail; rcpt
 accept: condition test succeeded

-SMTP>> 250 Accepted\r
+SMTP>> 250 Accepted

 SMTP<< data
 SMTP<< data

-SMTP>> 354 Enter message, ending with "." on a line by itself\r
+SMTP>> 354 Enter message, ending with "." on a line by itself

 search_tidyup called
 >>Headers received:
 
 search_tidyup called
 >>Headers received:
 


@@ -87,7 +87,7 @@ calling local_scan(); timeout=300
 local_scan() returned 0 NULL
 LOG: MAIN
   <= x@y H=(something) [V4NET.0.0.0] P=esmtp S=sss
 local_scan() returned 0 NULL
 LOG: MAIN
   <= x@y H=(something) [V4NET.0.0.0] P=esmtp S=sss

-SMTP>> 250 OK id=10HmaX-0005vi-00\r
+SMTP>> 250 OK id=10HmaX-0005vi-00

 smtp_setup_msg entered
 SMTP<< vrfy x@y
 host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 smtp_setup_msg entered
 SMTP<< vrfy x@y
 host in smtp_accept_max_nonmail_hosts? yes (matched "*")


@@ -109,7 +109,7 @@ routing x@y
 no more routers
 LOG: MAIN
   VRFY failed for x@y H=(something) [V4NET.0.0.0]
 no more routers
 LOG: MAIN
   VRFY failed for x@y H=(something) [V4NET.0.0.0]

-SMTP>> 550 <x@y> Unrouteable address\r
+SMTP>> 550 <x@y> Unrouteable address

 SMTP<< mail from:<x@y>
 using ACL "mail"
 processing "accept"
 SMTP<< mail from:<x@y>
 using ACL "mail"
 processing "accept"


@@ -120,9 +120,9 @@ check set acl_c9 = $acl_c9; mail
 check set acl_m0 = $acl_m0; mail
                  = ; mail
 accept: condition test succeeded
 check set acl_m0 = $acl_m0; mail
                  = ; mail
 accept: condition test succeeded

-SMTP>> 250 OK\r
+SMTP>> 250 OK

 SMTP<< quit
 SMTP<< quit

-SMTP>> 221 mail.test.ex closing connection\r
+SMTP>> 221 mail.test.ex closing connection

 LOG: smtp_connection MAIN
   SMTP connection from (something) [V4NET.0.0.0] closed by QUIT
 search_tidyup called
 LOG: smtp_connection MAIN
   SMTP connection from (something) [V4NET.0.0.0] closed by QUIT
 search_tidyup called