Call notquite ACL for synprot-error limit. Bug 3092

[exim.git] / test / stderr / 0275

diff --git a/test/stderr/0275 b/test/stderr/0275
index 7016b59740eaec1f7687fba71dd5dd7a922df358..1a98284a90f49f758d1ca7fddc09950a106596cc 100644 (file)
--- a/test/stderr/0275
+++ b/test/stderr/0275
@@ -145,13 +145,14 @@ test.ex in domains?
  cached lookup data = NULL
  list element: +n2_domains
   start sublist n2_domains
  cached lookup data = NULL
  list element: +n2_domains
   start sublist n2_domains

-   test.ex in "<; never2.ex ; +n1_domains"?
+   list separator: ';'
+   test.ex in " never2.ex ; +n1_domains"?

    ╎list element: never2.ex
    ╎list element: +n1_domains
    ╎ start sublist n1_domains
    ╎cached no match for +n1_domains
    ╎cached lookup data = NULL
    ╎list element: never2.ex
    ╎list element: +n1_domains
    ╎ start sublist n1_domains
    ╎cached no match for +n1_domains
    ╎cached lookup data = NULL

-   test.ex in "<; never2.ex ; +n1_domains"? no (end of list)
+   test.ex in " never2.ex ; +n1_domains"? no (end of list)

   end sublist n2_domains
  list element: !+local_domains
   start sublist local_domains
   end sublist n2_domains
  list element: !+local_domains
   start sublist local_domains


@@ -232,6 +233,7 @@ Size of headers = sss
 LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log

+receive_msg: tidyup

 search_tidyup called
 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-000000005vi-0000
 Exim version x.yz ....
 search_tidyup called
 exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xf7715cfd -MCd local-accept-delivery -odi -Mc 10HmaX-000000005vi-0000
 Exim version x.yz ....


@@ -259,9 +261,6 @@ body_linecount=0 message_linecount=8
 DSN: set orcpt:   flags: 0x0
 Delivery address list:
   userx@test.ex 
 DSN: set orcpt:   flags: 0x0
 Delivery address list:
   userx@test.ex 

- EXIM_DBOPEN: file <TESTSUITE/spool/db/retry> dir <TESTSUITE/spool/db> flags=O_RDONLY
- returned from EXIM_DBOPEN: (nil)
- failed to open DB file TESTSUITE/spool/db/retry: No such file or directory

 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: userx@test.ex
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: userx@test.ex


@@ -285,8 +284,9 @@ test.ex in hold_domains?
  cached no match for +hold_domains
 test.ex in hold_domains? no (end of list)
 unique = userx@test.ex
  cached no match for +hold_domains
 test.ex in hold_domains? no (end of list)
 unique = userx@test.ex

-no   domain  retry record
-no   address retry record
+checking router retry status
+ no   domain  retry record
+ no   address retry record

 userx@test.ex: queued for routing
 test.ex in queue_domains?
  list element: !+not_queue_domains
 userx@test.ex: queued for routing
 test.ex in queue_domains?
  list element: !+not_queue_domains


@@ -410,13 +410,14 @@ test.ex in domains?
  cached lookup data = NULL
  list element: +n2_domains
   start sublist n2_domains
  cached lookup data = NULL
  list element: +n2_domains
   start sublist n2_domains

-   test.ex in "<; never2.ex ; +n1_domains"?
+   list separator: ';'
+   test.ex in " never2.ex ; +n1_domains"?

    ╎list element: never2.ex
    ╎list element: +n1_domains
    ╎ start sublist n1_domains
    ╎cached no match for +n1_domains
    ╎cached lookup data = NULL
    ╎list element: never2.ex
    ╎list element: +n1_domains
    ╎ start sublist n1_domains
    ╎cached no match for +n1_domains
    ╎cached lookup data = NULL

-   test.ex in "<; never2.ex ; +n1_domains"? no (end of list)
+   test.ex in " never2.ex ; +n1_domains"? no (end of list)

   end sublist n2_domains
  list element: !+local_domains
   start sublist local_domains
   end sublist n2_domains
  list element: !+local_domains
   start sublist local_domains


@@ -458,9 +459,6 @@ After routing:
 search_tidyup called
 >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
 --------> userx@test.ex <--------
 search_tidyup called
 >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
 --------> userx@test.ex <--------

- EXIM_DBOPEN: file <TESTSUITE/spool/db/retry> dir <TESTSUITE/spool/db> flags=O_RDONLY
- returned from EXIM_DBOPEN: (nil)
- failed to open DB file TESTSUITE/spool/db/retry: No such file or directory

 no retry data available
 search_tidyup called
 changed uid/gid: local delivery to userx <userx@test.ex> transport=t1
 no retry data available
 search_tidyup called
 changed uid/gid: local delivery to userx <userx@test.ex> transport=t1


@@ -487,10 +485,10 @@ changed uid/gid: post-delivery tidying
   uid=EXIM_UID gid=EXIM_GID pid=p1236
 set_process_info: pppp tidying up after delivering 10HmaX-000000005vi-0000
 Processing retry items
   uid=EXIM_UID gid=EXIM_GID pid=p1236
 set_process_info: pppp tidying up after delivering 10HmaX-000000005vi-0000
 Processing retry items

-Succeeded addresses:
- userx@test.ex: no retry items
-Failed addresses:
-Deferred addresses:
+ Succeeded addresses:
+  userx@test.ex: no retry items
+ Failed addresses:
+ Deferred addresses:

 end of retry processing
 DSN: processing router : r3
 DSN: processing successful delivery address: userx@test.ex
 end of retry processing
 DSN: processing router : r3
 DSN: processing successful delivery address: userx@test.ex


@@ -563,7 +561,7 @@ test.ex in percent_hack_domains?
    ╎test.ex in "test.ex"? yes (matched "test.ex")
   end sublist not_queue_domains
  test.ex in percent_hack_domains? yes (matched "+not_queue_domains")
    ╎test.ex in "test.ex"? yes (matched "test.ex")
   end sublist not_queue_domains
  test.ex in percent_hack_domains? yes (matched "+not_queue_domains")

-processing "accept" (TESTSUITE/test-config 102)
+processing inline ACL "accept"

 check verify = recipient
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Verifying error@test.ex
 check verify = recipient
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Verifying error@test.ex