Testsuite: drop PRDR testcase from general MAIL-FROM-with-options testing

[exim.git] / test / stderr / 0121

diff --git a/test/stderr/0121 b/test/stderr/0121
index 8e6e33d1c7e81e0557967af689c227768f51cb68..e5e006d54c1015181b139c37f1eee24cbf25fd6e 100644 (file)
--- a/test/stderr/0121
+++ b/test/stderr/0121
@@ -163,6 +163,7 @@ LOG: 10HmaX-000000005vi-0000 H=(test) [127.0.0.1] F=<userx@test.ex> rejected aft
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)

+LOG: 10HmaY-000000005vi-0000 qualify/rewrite: missing or malformed local part

 >>> using ACL "check_message"
 >>> processing "require" (TESTSUITE/test-config 27)
 >>> check verify = header_sender
 >>> using ACL "check_message"
 >>> processing "require" (TESTSUITE/test-config 27)
 >>> check verify = header_sender


@@ -255,6 +256,8 @@ LOG: 10HmaZ-000000005vi-0000 H=(test) [127.0.0.1] F=<userx@test.ex> temporarily
 >>>  list element: @
 >>>  list element: @[]
 >>> foo.bar in helo_lookup_domains? no (end of list)
 >>>  list element: @
 >>>  list element: @[]
 >>> foo.bar in helo_lookup_domains? no (end of list)

+>>>  list element: *
+>>>  host in limits_advertise_hosts? yes (matched "*")

 >>> host in dsn_advertise_hosts? no (option unset)
 >>> host in pipelining_advertise_hosts?
 >>>  list element: *
 >>> host in dsn_advertise_hosts? no (option unset)
 >>> host in pipelining_advertise_hosts?
 >>>  list element: *


@@ -268,16 +271,8 @@ LOG: 10HmaZ-000000005vi-0000 H=(test) [127.0.0.1] F=<userx@test.ex> temporarily
 >>>  list element: @
 >>>  list element: @[]
 >>> foo.bar in helo_lookup_domains? no (end of list)
 >>>  list element: @
 >>>  list element: @[]
 >>> foo.bar in helo_lookup_domains? no (end of list)

->>> host in dsn_advertise_hosts? no (option unset)
->>> host in pipelining_advertise_hosts?

 >>>  list element: *
 >>>  list element: *

->>>  host in pipelining_advertise_hosts? yes (matched "*")
->>> host in chunking_advertise_hosts?
->>> host in chunking_advertise_hosts? no (end of list)
->>> foo.bar in helo_lookup_domains?
->>>  list element: @
->>>  list element: @[]
->>> foo.bar in helo_lookup_domains? no (end of list)
+>>>  host in limits_advertise_hosts? yes (matched "*")

 >>> host in dsn_advertise_hosts? no (option unset)
 >>> host in pipelining_advertise_hosts?
 >>>  list element: *
 >>> host in dsn_advertise_hosts? no (option unset)
 >>> host in pipelining_advertise_hosts?
 >>>  list element: *


@@ -288,6 +283,8 @@ LOG: 10HmaZ-000000005vi-0000 H=(test) [127.0.0.1] F=<userx@test.ex> temporarily
 >>>  list element: @
 >>>  list element: @[]
 >>> foo.bar in helo_lookup_domains? no (end of list)
 >>>  list element: @
 >>>  list element: @[]
 >>> foo.bar in helo_lookup_domains? no (end of list)

+>>>  list element: *
+>>>  host in limits_advertise_hosts? yes (matched "*")

 >>> host in dsn_advertise_hosts? no (option unset)
 >>> host in pipelining_advertise_hosts?
 >>>  list element: *
 >>> host in dsn_advertise_hosts? no (option unset)
 >>> host in pipelining_advertise_hosts?
 >>>  list element: *


@@ -298,6 +295,8 @@ LOG: 10HmaZ-000000005vi-0000 H=(test) [127.0.0.1] F=<userx@test.ex> temporarily
 >>>  list element: @
 >>>  list element: @[]
 >>> foo.bar in helo_lookup_domains? no (end of list)
 >>>  list element: @
 >>>  list element: @[]
 >>> foo.bar in helo_lookup_domains? no (end of list)

+>>>  list element: *
+>>>  host in limits_advertise_hosts? yes (matched "*")

 >>> host in dsn_advertise_hosts? no (option unset)
 >>> host in pipelining_advertise_hosts?
 >>>  list element: *
 >>> host in dsn_advertise_hosts? no (option unset)
 >>> host in pipelining_advertise_hosts?
 >>>  list element: *