From 3d9967d0bde089401df0509a2695f5fdbc4644a9 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Tue, 7 May 2024 14:33:46 +0100 Subject: [PATCH 1/1] Testsuite: drop PRDR testcase from general MAIL-FROM-with-options testing The PRDR-specific testcases check it works and not all builds include PRDR --- test/runtest | 2 +- test/scripts/0000-Basic/0121 | 3 --- test/stderr/0121 | 12 ------------ test/stdout/0121 | 8 -------- test/stdout/0572 | 1 - 5 files changed, 1 insertion(+), 25 deletions(-) diff --git a/test/runtest b/test/runtest index 91a81510e..68b73d62d 100755 --- a/test/runtest +++ b/test/runtest @@ -1088,7 +1088,7 @@ RESET_AFTER_EXTRA_LINE_READ: 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 =/; diff --git a/test/scripts/0000-Basic/0121 b/test/scripts/0000-Basic/0121 index 85392b6a6..ce16b584a 100644 --- 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"@localhost5> PRDR quit **** diff --git a/test/stderr/0121 b/test/stderr/0121 index 40ba5f191..e5e006d54 100644 --- a/test/stderr/0121 +++ b/test/stderr/0121 @@ -303,15 +303,3 @@ LOG: 10HmaZ-000000005vi-0000 H=(test) [127.0.0.1] F= temporarily >>> 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 f31f368eb..16fcbe1d0 100644 --- a/test/stdout/0121 +++ b/test/stdout/0121 @@ -73,12 +73,4 @@ 250-PIPELINING 250 HELP 250 OK -250 Reset OK -250-the.local.host.name Hello foo.bar [127.0.0.1] -250-SIZE 52428800 -250-LIMITS MAILMAX=1000 RCPTMAX=50000 -250-8BITMIME -250-PIPELINING -250 HELP -250 OK 221 the.local.host.name closing connection diff --git a/test/stdout/0572 b/test/stdout/0572 index acfa5a0cd..a7347706b 100644 --- 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_prdr = * interface = ip4.ip4.ip4.ip4 keepalive no_lmtp_ignore_quota -- 2.30.2