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

The PRDR-specific testcases check it works and not all builds include PRDR

diff --git a/test/runtest b/test/runtest
index 91a81510e6abe0afb88827be1cb9466e467a73eb..68b73d62d37ce21cbf157c46586ef71f488f3563 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -1088,7 +1088,7 @@ RESET_AFTER_EXTRA_LINE_READ:
     next if /^limits_advertise_hosts =/;
 
     # PRDR
     next if /^limits_advertise_hosts =/;
 
     # PRDR

-    next if /^hosts_try_prdr = *$/;
+    next if /^hosts_try_prdr = \*$/;

 
     # TLS resumption is not always supported by the build
     next if /^tls_resumption_hosts =/;
 
     # TLS resumption is not always supported by the build
     next if /^tls_resumption_hosts =/;

diff --git a/test/scripts/0000-Basic/0121 b/test/scripts/0000-Basic/0121
index 85392b6a68c4569ae8130a2da221adf8cf42ec5b..ce16b584aea5489dfdbb1f0bb3af48813e6b17e7 100644 (file)
--- a/test/scripts/0000-Basic/0121
+++ b/test/scripts/0000-Basic/0121
@@ -43,8 +43,5 @@ mail from:<"a b"@localhost3> SIZE=1234
 rset
 ehlo foo.bar
 mail from:"a b"@localhost4 SIZE=1234
 rset
 ehlo foo.bar
 mail from:"a b"@localhost4 SIZE=1234

-rset
-ehlo foo.bar
-mail from:<"a b"@localhost5> PRDR

 quit
 ****
 quit
 ****

diff --git a/test/stderr/0121 b/test/stderr/0121
index 40ba5f191612bd87eb30df0678e8b0068188c580..e5e006d54c1015181b139c37f1eee24cbf25fd6e 100644 (file)
--- a/test/stderr/0121
+++ b/test/stderr/0121
@@ -303,15 +303,3 @@ LOG: 10HmaZ-000000005vi-0000 H=(test) [127.0.0.1] F=<userx@test.ex> temporarily
 >>>  host in pipelining_advertise_hosts? yes (matched "*")
 >>> host in chunking_advertise_hosts?
 >>> host in chunking_advertise_hosts? no (end of list)
 >>>  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)
->>>  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 pipelining_advertise_hosts? yes (matched "*")
->>> host in chunking_advertise_hosts?
->>> host in chunking_advertise_hosts? no (end of list)

diff --git a/test/stdout/0121 b/test/stdout/0121
index f31f368eb4828b7b020804eb2895ec8f62219a6f..16fcbe1d0ab9597e24fc536a901111f38ee11a1a 100644 (file)
--- a/test/stdout/0121
+++ b/test/stdout/0121
@@ -73,12 +73,4 @@
 250-PIPELINING\r
 250 HELP\r
 250 OK\r
 250-PIPELINING\r
 250 HELP\r
 250 OK\r

-250 Reset OK\r
-250-the.local.host.name Hello foo.bar [127.0.0.1]\r
-250-SIZE 52428800\r
-250-LIMITS MAILMAX=1000 RCPTMAX=50000\r
-250-8BITMIME\r
-250-PIPELINING\r
-250 HELP\r
-250 OK\r

 221 the.local.host.name closing connection\r
 221 the.local.host.name closing connection\r

diff --git a/test/stdout/0572 b/test/stdout/0572
index acfa5a0cd52910dd60c5f568a74dbb812ef160bf..a7347706bd119da6b80748dbc4a87f520e763f25 100644 (file)
--- a/test/stdout/0572
+++ b/test/stdout/0572
@@ -60,7 +60,6 @@ hosts_require_auth =
 hosts_try_auth = 
 hosts_try_chunking = *
 hosts_try_fastopen = :
 hosts_try_auth = 
 hosts_try_chunking = *
 hosts_try_fastopen = :

-hosts_try_prdr = *

 interface = ip4.ip4.ip4.ip4
 keepalive
 no_lmtp_ignore_quota
 interface = ip4.ip4.ip4.ip4
 keepalive
 no_lmtp_ignore_quota