From 76003495bfb6712c30b07cbcaf088c80b69b720d Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Mon, 8 Aug 2016 16:26:14 +0100 Subject: [PATCH] Testsuite: accept debug & testscript output sizes varying with testhost name --- test/runtest | 6 ++++++ test/stderr/0143 | 10 +++++----- test/stderr/0388 | 8 ++++---- test/stderr/0398 | 8 ++++---- test/stderr/0432 | 8 ++++---- test/stderr/0476 | 6 +++--- test/stderr/2013 | 18 +++++++++--------- test/stderr/2113 | 18 +++++++++--------- test/stderr/5410 | 22 +++++++++++----------- test/stderr/5420 | 22 +++++++++++----------- test/stdout/0901 | 26 +++++++++++++------------- test/stdout/0902 | 28 ++++++++++++++-------------- test/stdout/5591 | 2 +- 13 files changed, 94 insertions(+), 88 deletions(-) diff --git a/test/runtest b/test/runtest index 0a95b70ec..713c467d1 100755 --- a/test/runtest +++ b/test/runtest @@ -867,6 +867,9 @@ RESET_AFTER_EXTRA_LINE_READ: # gnutls version variances next if /^Error in the pull function./; + + # Sizes vary with test hostname + s/^BDAT \d+/BDAT ddd/; } # ======== stderr ======== @@ -1024,6 +1027,9 @@ RESET_AFTER_EXTRA_LINE_READ: # Environment cleaning next if /\w+ in keep_environment\? (yes|no)/; + # Sizes vary with test hostname + s/^cmd buf flush \d+ bytes$/cmd buf flush ddd bytes/; + # When Exim is checking the size of directories for maildir, it uses # the check_dir_size() function to scan directories. Of course, the order # of the files that are obtained using readdir() varies from system to diff --git a/test/stderr/0143 b/test/stderr/0143 index 06370ba40..9b9143c72 100644 --- a/test/stderr/0143 +++ b/test/stderr/0143 @@ -20,20 +20,20 @@ delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@domain.com) Connecting to 127.0.0.1 [127.0.0.1]:1224 from ip4.ip4.ip4.ip4 ... connected SMTP<< 220 ESMTP SMTP>> EHLO myhost.test.ex -cmd buf flush 21 bytes +cmd buf flush ddd bytes SMTP<< 250-OK 250-HELP 250 AUTH LOGIN not using PIPELINING not using DSN SMTP>> MAIL FROM: -cmd buf flush 37 bytes +cmd buf flush ddd bytes SMTP<< 250 Sender OK SMTP>> RCPT TO: -cmd buf flush 28 bytes +cmd buf flush ddd bytes SMTP<< 250 Recipient OK SMTP>> DATA -cmd buf flush 6 bytes +cmd buf flush ddd bytes SMTP<< 354 Send data SMTP>> writing message and terminating "." writing data block fd=dddd size=sss timeout=300 @@ -43,7 +43,7 @@ transport_check_waiting entered sequence=1 local_max=500 global_max=-1 no messages waiting for 127.0.0.1 SMTP>> QUIT -cmd buf flush 6 bytes +cmd buf flush ddd bytes SMTP(close)>> Leaving my_smtp transport LOG: MAIN diff --git a/test/stderr/0388 b/test/stderr/0388 index e8269e035..accc257e1 100644 --- a/test/stderr/0388 +++ b/test/stderr/0388 @@ -85,20 +85,20 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready 127.0.0.1 in hosts_avoid_esmtp? no (option unset) SMTP>> EHLO myhost.test.ex -cmd buf flush 21 bytes +cmd buf flush ddd bytes SMTP<< 250 OK 127.0.0.1 in hosts_require_auth? no (option unset) SMTP>> MAIL FROM: -cmd buf flush 37 bytes +cmd buf flush ddd bytes SMTP<< 250 OK SMTP>> RCPT TO: -cmd buf flush 15 bytes +cmd buf flush ddd bytes SMTP<< 451 Temporary error LOG: MAIN H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:: 451 Temporary error added retry item for R:x@y: errno=-44 more_errno=dd,A flags=0 SMTP>> QUIT -cmd buf flush 6 bytes +cmd buf flush ddd bytes SMTP(close)>> set_process_info: pppp delivering 10HmaX-0005vi-00: just tried 127.0.0.1 [127.0.0.1] for x@y: result OK address match test: subject=*@127.0.0.1 pattern=* diff --git a/test/stderr/0398 b/test/stderr/0398 index c11dd6f86..ca824b0d5 100644 --- a/test/stderr/0398 +++ b/test/stderr/0398 @@ -130,17 +130,17 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready 127.0.0.1 in hosts_avoid_esmtp? no (option unset) SMTP>> EHLO mail.test.ex -cmd buf flush 19 bytes +cmd buf flush ddd bytes SMTP<< 250 OK 127.0.0.1 in hosts_require_auth? no (option unset) SMTP>> MAIL FROM:<> -cmd buf flush 14 bytes +cmd buf flush ddd bytes SMTP<< 250 OK SMTP>> RCPT TO: -cmd buf flush 21 bytes +cmd buf flush ddd bytes SMTP<< 550 Unknown SMTP>> QUIT -cmd buf flush 6 bytes +cmd buf flush ddd bytes locking TESTSUITE/spool/db/callout.lockfile locked TESTSUITE/spool/db/callout.lockfile EXIM_DBOPEN(TESTSUITE/spool/db/callout) diff --git a/test/stderr/0432 b/test/stderr/0432 index 54b9593bd..a27a2fe83 100644 --- a/test/stderr/0432 +++ b/test/stderr/0432 @@ -91,17 +91,17 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 server ready 127.0.0.1 in hosts_avoid_esmtp? no (option unset) SMTP>> EHLO myhost.test.ex -cmd buf flush 21 bytes +cmd buf flush ddd bytes SMTP<< 250 OK 127.0.0.1 in hosts_require_auth? no (option unset) SMTP>> MAIL FROM:<> -cmd buf flush 14 bytes +cmd buf flush ddd bytes SMTP<< 250 OK SMTP>> RCPT TO: -cmd buf flush 15 bytes +cmd buf flush ddd bytes SMTP<< 250 OK SMTP>> QUIT -cmd buf flush 6 bytes +cmd buf flush ddd bytes locking TESTSUITE/spool/db/callout.lockfile locked TESTSUITE/spool/db/callout.lockfile EXIM_DBOPEN(TESTSUITE/spool/db/callout) diff --git a/test/stderr/0476 b/test/stderr/0476 index 695557676..b4f54c4f1 100644 --- a/test/stderr/0476 +++ b/test/stderr/0476 @@ -19,7 +19,7 @@ set_process_info: pppp delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (use Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready SMTP>> EHLO the.local.host.name -cmd buf flush 18 bytes +cmd buf flush ddd bytes SMTP<< 250-server id 250-PIPELINING 250 OK @@ -28,7 +28,7 @@ not using DSN SMTP>> MAIL FROM: SMTP>> RCPT TO: SMTP>> DATA -cmd buf flush 65 bytes +cmd buf flush ddd bytes SMTP<< 250 OK SMTP<< 550 NO Remote host closed connection in response to pipelined DATA @@ -37,7 +37,7 @@ ok=1 send_quit=1 send_rset=1 continue_more=0 yield=0 first_address is NULL transport_check_waiting entered sequence=1 local_max=500 global_max=-1 SMTP>> RSET -cmd buf flush 6 bytes +cmd buf flush ddd bytes H=127.0.0.1 [127.0.0.1] Remote host closed connection in response to RSET SMTP(close)>> set_process_info: pppp delivering 10HmaX-0005vi-00: just tried 127.0.0.1 [127.0.0.1] for userx@test.ex: result OK diff --git a/test/stderr/2013 b/test/stderr/2013 index 459f75027..9ddfc2f66 100644 --- a/test/stderr/2013 +++ b/test/stderr/2013 @@ -6,7 +6,7 @@ LOG: queue_run MAIN Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 SMTP>> EHLO myhost.test.ex -cmd buf flush 21 bytes +cmd buf flush ddd bytes SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1] 250-SIZE 52428800 250-8BITMIME @@ -14,10 +14,10 @@ cmd buf flush 21 bytes 250-STARTTLS 250 HELP SMTP>> STARTTLS -cmd buf flush 10 bytes +cmd buf flush ddd bytes SMTP<< 220 TLS go ahead SMTP>> EHLO myhost.test.ex -cmd buf flush 21 bytes +cmd buf flush ddd bytes SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1] 250-SIZE 52428800 250-8BITMIME @@ -26,13 +26,13 @@ cmd buf flush 21 bytes SMTP>> MAIL FROM: SIZE=ssss SMTP>> RCPT TO: SMTP>> DATA -cmd buf flush 78 bytes +cmd buf flush ddd bytes SMTP<< 250 OK SMTP<< 250 Accepted SMTP<< 354 Enter message, ending with "." on a line by itself SMTP<< 250 OK id=10HmaZ-0005vi-00 SMTP>> EHLO myhost.test.ex -cmd buf flush 21 bytes +cmd buf flush ddd bytes SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1] 250-SIZE 52428800 250-8BITMIME @@ -49,10 +49,10 @@ configuration file is TESTSUITE/test-config trusted user admin user SMTP>> STARTTLS -cmd buf flush 10 bytes +cmd buf flush ddd bytes SMTP<< 220 TLS go ahead SMTP>> EHLO myhost.test.ex -cmd buf flush 21 bytes +cmd buf flush ddd bytes SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1] 250-SIZE 52428800 250-8BITMIME @@ -61,13 +61,13 @@ cmd buf flush 21 bytes SMTP>> MAIL FROM: SIZE=ssss SMTP>> RCPT TO: SMTP>> DATA -cmd buf flush 78 bytes +cmd buf flush ddd bytes SMTP<< 250 OK SMTP<< 250 Accepted SMTP<< 354 Enter message, ending with "." on a line by itself SMTP<< 250 OK id=10HmbA-0005vi-00 SMTP>> QUIT -cmd buf flush 6 bytes +cmd buf flush ddd bytes SMTP(close)>> LOG: MAIN => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00" diff --git a/test/stderr/2113 b/test/stderr/2113 index 1ea573043..2db86789b 100644 --- a/test/stderr/2113 +++ b/test/stderr/2113 @@ -6,7 +6,7 @@ LOG: queue_run MAIN Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 SMTP>> EHLO myhost.test.ex -cmd buf flush 21 bytes +cmd buf flush ddd bytes SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1] 250-SIZE 52428800 250-8BITMIME @@ -14,10 +14,10 @@ cmd buf flush 21 bytes 250-STARTTLS 250 HELP SMTP>> STARTTLS -cmd buf flush 10 bytes +cmd buf flush ddd bytes SMTP<< 220 TLS go ahead SMTP>> EHLO myhost.test.ex -cmd buf flush 21 bytes +cmd buf flush ddd bytes SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1] 250-SIZE 52428800 250-8BITMIME @@ -26,13 +26,13 @@ cmd buf flush 21 bytes SMTP>> MAIL FROM: SIZE=ssss SMTP>> RCPT TO: SMTP>> DATA -cmd buf flush 78 bytes +cmd buf flush ddd bytes SMTP<< 250 OK SMTP<< 250 Accepted SMTP<< 354 Enter message, ending with "." on a line by itself SMTP<< 250 OK id=10HmaZ-0005vi-00 SMTP>> EHLO myhost.test.ex -cmd buf flush 21 bytes +cmd buf flush ddd bytes SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1] 250-SIZE 52428800 250-8BITMIME @@ -49,10 +49,10 @@ configuration file is TESTSUITE/test-config trusted user admin user SMTP>> STARTTLS -cmd buf flush 10 bytes +cmd buf flush ddd bytes SMTP<< 220 TLS go ahead SMTP>> EHLO myhost.test.ex -cmd buf flush 21 bytes +cmd buf flush ddd bytes SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1] 250-SIZE 52428800 250-8BITMIME @@ -61,13 +61,13 @@ cmd buf flush 21 bytes SMTP>> MAIL FROM: SIZE=ssss SMTP>> RCPT TO: SMTP>> DATA -cmd buf flush 78 bytes +cmd buf flush ddd bytes SMTP<< 250 OK SMTP<< 250 Accepted SMTP<< 354 Enter message, ending with "." on a line by itself SMTP<< 250 OK id=10HmbA-0005vi-00 SMTP>> QUIT -cmd buf flush 6 bytes +cmd buf flush ddd bytes SMTP(close)>> LOG: MAIN => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLSv1:AES256-SHA:256 CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00" diff --git a/test/stderr/5410 b/test/stderr/5410 index e305e6a90..73a8b3b2b 100644 --- a/test/stderr/5410 +++ b/test/stderr/5410 @@ -56,7 +56,7 @@ considering: $primary_hostname SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 127.0.0.1 in hosts_avoid_esmtp? no (option unset) SMTP>> EHLO myhost.test.ex -cmd buf flush 21 bytes +cmd buf flush ddd bytes SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4] 250-SIZE 52428800 250-8BITMIME @@ -102,14 +102,14 @@ considering: :}} result: : 127.0.0.1 in hosts_verify_avoid_tls? no (end of list) SMTP>> STARTTLS -cmd buf flush 10 bytes +cmd buf flush ddd bytes SMTP<< 220 TLS go ahead 127.0.0.1 in hosts_require_ocsp? no (option unset) 127.0.0.1 in hosts_request_ocsp? yes (matched "*") 127.0.0.1 in tls_verify_hosts? no (option unset) 127.0.0.1 in tls_try_verify_hosts? no (end of list) SMTP>> EHLO myhost.test.ex -cmd buf flush 21 bytes +cmd buf flush ddd bytes SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4] 250-SIZE 52428800 250-8BITMIME @@ -117,10 +117,10 @@ cmd buf flush 21 bytes 250 HELP 127.0.0.1 in hosts_require_auth? no (option unset) SMTP>> MAIL FROM: -cmd buf flush 37 bytes +cmd buf flush ddd bytes SMTP<< 250 OK SMTP>> RCPT TO: -cmd buf flush 28 bytes +cmd buf flush ddd bytes SMTP<< 250 Accepted holding verify callout open for cutthrough delivery ----------- end cutthrough setup ------------ @@ -319,7 +319,7 @@ considering: $primary_hostname SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 127.0.0.1 in hosts_avoid_esmtp? no (option unset) SMTP>> EHLO myhost.test.ex -cmd buf flush 21 bytes +cmd buf flush ddd bytes SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4] 250-SIZE 52428800 250-8BITMIME @@ -347,10 +347,10 @@ considering: *}{:}} 127.0.0.1 in hosts_avoid_tls? yes (matched "*") 127.0.0.1 in hosts_require_auth? no (option unset) SMTP>> MAIL FROM: -cmd buf flush 37 bytes +cmd buf flush ddd bytes SMTP<< 250 OK SMTP>> RCPT TO: -cmd buf flush 28 bytes +cmd buf flush ddd bytes SMTP<< 250 Accepted holding verify callout open for cutthrough delivery ----------- end cutthrough setup ------------ @@ -549,7 +549,7 @@ considering: $primary_hostname SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 127.0.0.1 in hosts_avoid_esmtp? no (option unset) SMTP>> EHLO myhost.test.ex -cmd buf flush 21 bytes +cmd buf flush ddd bytes SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4] 250-SIZE 52428800 250-8BITMIME @@ -577,10 +577,10 @@ considering: *}{:}} 127.0.0.1 in hosts_avoid_tls? yes (matched "*") 127.0.0.1 in hosts_require_auth? no (option unset) SMTP>> MAIL FROM: -cmd buf flush 37 bytes +cmd buf flush ddd bytes SMTP<< 250 OK SMTP>> RCPT TO: -cmd buf flush 28 bytes +cmd buf flush ddd bytes SMTP<< 250 Accepted holding verify callout open for cutthrough delivery ----------- end cutthrough setup ------------ diff --git a/test/stderr/5420 b/test/stderr/5420 index ac54a65d6..635f4246d 100644 --- a/test/stderr/5420 +++ b/test/stderr/5420 @@ -56,7 +56,7 @@ considering: $primary_hostname SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 127.0.0.1 in hosts_avoid_esmtp? no (option unset) SMTP>> EHLO myhost.test.ex -cmd buf flush 21 bytes +cmd buf flush ddd bytes SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4] 250-SIZE 52428800 250-8BITMIME @@ -102,13 +102,13 @@ considering: :}} result: : 127.0.0.1 in hosts_verify_avoid_tls? no (end of list) SMTP>> STARTTLS -cmd buf flush 10 bytes +cmd buf flush ddd bytes SMTP<< 220 TLS go ahead 127.0.0.1 in tls_verify_hosts? no (option unset) 127.0.0.1 in tls_try_verify_hosts? yes (matched "*") 127.0.0.1 in tls_verify_cert_hostnames? yes (matched "*") SMTP>> EHLO myhost.test.ex -cmd buf flush 21 bytes +cmd buf flush ddd bytes SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4] 250-SIZE 52428800 250-8BITMIME @@ -116,10 +116,10 @@ cmd buf flush 21 bytes 250 HELP 127.0.0.1 in hosts_require_auth? no (option unset) SMTP>> MAIL FROM: -cmd buf flush 37 bytes +cmd buf flush ddd bytes SMTP<< 250 OK SMTP>> RCPT TO: -cmd buf flush 28 bytes +cmd buf flush ddd bytes SMTP<< 250 Accepted holding verify callout open for cutthrough delivery ----------- end cutthrough setup ------------ @@ -318,7 +318,7 @@ considering: $primary_hostname SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 127.0.0.1 in hosts_avoid_esmtp? no (option unset) SMTP>> EHLO myhost.test.ex -cmd buf flush 21 bytes +cmd buf flush ddd bytes SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4] 250-SIZE 52428800 250-8BITMIME @@ -346,10 +346,10 @@ considering: *}{:}} 127.0.0.1 in hosts_avoid_tls? yes (matched "*") 127.0.0.1 in hosts_require_auth? no (option unset) SMTP>> MAIL FROM: -cmd buf flush 37 bytes +cmd buf flush ddd bytes SMTP<< 250 OK SMTP>> RCPT TO: -cmd buf flush 28 bytes +cmd buf flush ddd bytes SMTP<< 250 Accepted holding verify callout open for cutthrough delivery ----------- end cutthrough setup ------------ @@ -548,7 +548,7 @@ considering: $primary_hostname SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 127.0.0.1 in hosts_avoid_esmtp? no (option unset) SMTP>> EHLO myhost.test.ex -cmd buf flush 21 bytes +cmd buf flush ddd bytes SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4] 250-SIZE 52428800 250-8BITMIME @@ -576,10 +576,10 @@ considering: *}{:}} 127.0.0.1 in hosts_avoid_tls? yes (matched "*") 127.0.0.1 in hosts_require_auth? no (option unset) SMTP>> MAIL FROM: -cmd buf flush 37 bytes +cmd buf flush ddd bytes SMTP<< 250 OK SMTP>> RCPT TO: -cmd buf flush 28 bytes +cmd buf flush ddd bytes SMTP<< 250 Accepted holding verify callout open for cutthrough delivery ----------- end cutthrough setup ------------ diff --git a/test/stdout/0901 b/test/stdout/0901 index 12ed5ce0f..c1b40a430 100644 --- a/test/stdout/0901 +++ b/test/stdout/0901 @@ -10,7 +10,7 @@ MAIL FROM:<> 250 OK RCPT TO: 250 OK -BDAT 323 LAST +BDAT ddd LAST 250 OK QUIT 225 OK @@ -26,7 +26,7 @@ MAIL FROM:<> 250 good mail cmd RCPT TO: 250 acceptable rcpt cmd -BDAT 323 LAST +BDAT ddd LAST Unxpected EOF read from client Listening on port 1224 ... Connection request from [127.0.0.1] @@ -38,7 +38,7 @@ MAIL FROM:<> 250 OK RCPT TO: 250 OK -BDAT 323 LAST +BDAT ddd LAST 250 OK Comparison failed - bailing out @@ -53,7 +53,7 @@ MAIL FROM:<> 250 OK RCPT TO: 250 OK -BDAT 323 LAST +BDAT ddd LAST 500 oops QUIT 225 OK @@ -68,7 +68,7 @@ MAIL FROM:<> 250 OK RCPT TO: 250 OK -BDAT 323 LAST +BDAT ddd LAST 400 not right now QUIT 225 OK @@ -82,7 +82,7 @@ EHLO the.local.host.name 250 CHUNKING MAIL FROM:<> RCPT TO: -BDAT 323 LAST +BDAT ddd LAST 250 OK mail 250 OK rcpt 250 OK bdat @@ -99,7 +99,7 @@ EHLO the.local.host.name 250 CHUNKING MAIL FROM:<> RCPT TO: -BDAT 323 LAST +BDAT ddd LAST Unxpected EOF read from client Listening on port 1224 ... Connection request from [127.0.0.1] @@ -110,7 +110,7 @@ EHLO the.local.host.name 250 CHUNKING MAIL FROM:<> RCPT TO: -BDAT 323 LAST +BDAT ddd LAST 250 OK mail 250 OK rcpt 250 OK bdat @@ -126,7 +126,7 @@ EHLO the.local.host.name 250 CHUNKING MAIL FROM:<> RCPT TO: -BDAT 323 LAST +BDAT ddd LAST 550 unacceptable mail-from 550 rcpt ungood lacking mail-from 500 bdat ungood lacking mail-from @@ -142,7 +142,7 @@ EHLO the.local.host.name 250 CHUNKING MAIL FROM:<> RCPT TO: -BDAT 324 LAST +BDAT ddd LAST 450 greylisted mail-from 550 rcpt ungood lacking mail-from 500 bdat ungood lacking mail-from @@ -158,7 +158,7 @@ EHLO the.local.host.name 250 CHUNKING MAIL FROM:<> RCPT TO: -BDAT 323 LAST +BDAT ddd LAST 250 OK mail 550 no such recipient 500 oops bdat @@ -174,7 +174,7 @@ EHLO the.local.host.name 250 CHUNKING MAIL FROM:<> RCPT TO: -BDAT 323 LAST +BDAT ddd LAST 250 OK mail 250 OK rcpt 500 oops bdat @@ -190,7 +190,7 @@ EHLO the.local.host.name 250 CHUNKING MAIL FROM:<> RCPT TO: -BDAT 323 LAST +BDAT ddd LAST 250 OK mail 250 OK rcpt 400 not right now bdat diff --git a/test/stdout/0902 b/test/stdout/0902 index 8c5422035..2c3a25381 100644 --- a/test/stdout/0902 +++ b/test/stdout/0902 @@ -10,9 +10,9 @@ MAIL FROM:<> 250 OK RCPT TO: 250 OK -BDAT 317 +BDAT ddd 250 OK nonlast bdat -BDAT 8380 LAST +BDAT ddd LAST 250 OK bdat QUIT 225 OK @@ -28,7 +28,7 @@ MAIL FROM:<> 250 OK RCPT TO: 250 OK -BDAT 317 +BDAT ddd 500 oops bdat-nonlast QUIT 225 OK @@ -42,11 +42,11 @@ EHLO the.local.host.name 250 CHUNKING MAIL FROM:<> RCPT TO: -BDAT 317 +BDAT ddd 250 OK mail 250 OK rcpt 250 OK nonlast bdat -BDAT 8380 LAST +BDAT ddd LAST 250 OK bdat QUIT 225 OK @@ -61,7 +61,7 @@ EHLO the.local.host.name 250 CHUNKING MAIL FROM:<> RCPT TO: -BDAT 317 +BDAT ddd 550 unacceptable mail-from 550 rcpt ungood lacking mail-from 500 bdat (nonlast) ungood lacking mail-from @@ -77,7 +77,7 @@ EHLO the.local.host.name 250 CHUNKING MAIL FROM:<> RCPT TO: -BDAT 317 +BDAT ddd 250 OK mail 550 no such recipient 500 oops nonlast bdat - no rcpt @@ -94,12 +94,12 @@ EHLO the.local.host.name MAIL FROM:<> RCPT TO: RCPT TO: -BDAT 301 +BDAT ddd 250 OK mail 550 no such recipient 250 good recipient 200 OK nonlast bdat -BDAT 8380 LAST +BDAT ddd LAST 250 OK bdat QUIT 225 OK @@ -113,7 +113,7 @@ EHLO the.local.host.name 250 CHUNKING MAIL FROM:<> RCPT TO: -BDAT 317 +BDAT ddd 250 OK mail 250 OK rcpt 500 oops nonlast bdat @@ -129,11 +129,11 @@ EHLO the.local.host.name 250 CHUNKING MAIL FROM:<> RCPT TO: -BDAT 317 +BDAT ddd 250 OK mail 250 OK rcpt 250 OK nonlast bdat -BDAT 8380 LAST +BDAT ddd LAST 500 oops bdat QUIT 225 OK @@ -147,11 +147,11 @@ EHLO the.local.host.name 250 CHUNKING MAIL FROM:<> RCPT TO: -BDAT 8191 +BDAT ddd 250 OK mail 250 OK rcpt 250 OK nonlast bdat -BDAT 829 LAST +BDAT ddd LAST 250 OK bdat QUIT 225 OK diff --git a/test/stdout/5591 b/test/stdout/5591 index 1a65e063d..b756ab32c 100644 --- a/test/stdout/5591 +++ b/test/stdout/5591 @@ -14,7 +14,7 @@ RCPT TO: 250 OK RCPT TO: 250 OK -BDAT 317 LAST +BDAT ddd LAST 353 prdr responses coming up 250 first rcpt was good 250 second rcpt was good -- 2.30.2