Testsuite: handle 1s-boundary crossing

[exim.git] / test / stdout / 0905

diff --git a/test/stdout/0905 b/test/stdout/0905
index 9a9104a74b8484f5ae0d83bc3b8768d6d3a1a6b0..7e687e7804be513c9768e433d234e568a9f75f07 100644 (file)
--- a/test/stdout/0905
+++ b/test/stdout/0905
@@ -5,14 +5,13 @@ Connection request from [127.0.0.1]
 220 Greetings
 EHLO testhost.test.ex
 250-Hello there
+250-PIPELINING
 250 CHUNKING
 MAIL FROM:<>
-250 OK
 RCPT TO:<a@test.ex>
-250 OK
-BDAT 311
-250 OK nonlast bdat
-BDAT 8380 LAST
+BDAT 345 LAST
+250 OK mail
+250 OK rcpt
 250 OK bdat
 QUIT
 225 OK
@@ -23,35 +22,17 @@ Connection request from [127.0.0.1]
 220 Greetings
 EHLO testhost.test.ex
 250-Hello there
-250 CHUNKING
-MAIL FROM:<>
-250 OK
-RCPT TO:<d@test.ex>
-250 OK
-BDAT 311
-500 oops bdat-nonlast
-QUIT
-225 OK
-End of script
-Listening on port 1224 ... 
-Connection request from [127.0.0.1]
-220 Greetings
-EHLO testhost.test.ex
-250-Hello there
 250-PIPELINING
 250 CHUNKING
 MAIL FROM:<>
-RCPT TO:<p@test.ex>
-BDAT 311
+RCPT TO:<c@test.ex>
+BDAT 345 LAST
 250 OK mail
 250 OK rcpt
-250 OK nonlast bdat
-BDAT 8380 LAST
 250 OK bdat
-QUIT
-225 OK
-Expected EOF read from client
-End of script
+
+Comparison failed - bailing out
+Expected: QUIT
 Listening on port 1224 ... 
 Connection request from [127.0.0.1]
 220 Greetings
@@ -60,11 +41,11 @@ EHLO testhost.test.ex
 250-PIPELINING
 250 CHUNKING
 MAIL FROM:<>
-RCPT TO:<s@test.ex>
-BDAT 311
+RCPT TO:<d@test.ex>
+BDAT 345 LAST
 550 unacceptable mail-from
 550 rcpt ungood lacking mail-from
-500 bdat (nonlast) ungood lacking mail-from
+500 bdat ungood lacking mail-from
 QUIT
 225 OK
 End of script
@@ -76,11 +57,11 @@ EHLO testhost.test.ex
 250-PIPELINING
 250 CHUNKING
 MAIL FROM:<>
-RCPT TO:<t@test.ex>
-BDAT 311
-250 OK mail
-550 no such recipient
-500 oops nonlast bdat - no rcpt
+RCPT TO:<c1@test.ex>
+BDAT 346 LAST
+450 greylisted mail-from
+550 rcpt ungood lacking mail-from
+500 bdat ungood lacking mail-from
 QUIT
 225 OK
 End of script
@@ -92,48 +73,10 @@ EHLO testhost.test.ex
 250-PIPELINING
 250 CHUNKING
 MAIL FROM:<>
-RCPT TO:<t1@test.ex>
-RCPT TO:<t2@test.ex>
-BDAT 295
+RCPT TO:<e@test.ex>
+BDAT 345 LAST
 250 OK mail
 550 no such recipient
-250 good recipient
-200 OK nonlast bdat
-BDAT 8380 LAST
-250 OK bdat
-QUIT
-225 OK
-End of script
-Listening on port 1224 ... 
-Connection request from [127.0.0.1]
-220 Greetings
-EHLO testhost.test.ex
-250-Hello there
-250-PIPELINING
-250 CHUNKING
-MAIL FROM:<>
-RCPT TO:<u@test.ex>
-BDAT 311
-250 OK mail
-250 OK rcpt
-500 oops nonlast bdat
-QUIT
-225 OK
-End of script
-Listening on port 1224 ... 
-Connection request from [127.0.0.1]
-220 Greetings
-EHLO testhost.test.ex
-250-Hello there
-250-PIPELINING
-250 CHUNKING
-MAIL FROM:<>
-RCPT TO:<v@test.ex>
-BDAT 311
-250 OK mail
-250 OK rcpt
-250 OK nonlast bdat
-BDAT 8380 LAST
 500 oops bdat
 QUIT
 225 OK
@@ -146,11 +89,11 @@ EHLO testhost.test.ex
 250-PIPELINING
 250 CHUNKING
 MAIL FROM:<>
-RCPT TO:<u@test.ex>
-BDAT 311
+RCPT TO:<g@test.ex>
+BDAT 345 LAST
 250 OK mail
 250 OK rcpt
-400 oops nonlast bdat
+500 oops bdat
 QUIT
 225 OK
 End of script
@@ -162,14 +105,11 @@ EHLO testhost.test.ex
 250-PIPELINING
 250 CHUNKING
 MAIL FROM:<>
-RCPT TO:<p@test.ex>
-BDAT 8191
+RCPT TO:<h@test.ex>
+BDAT 345 LAST
 250 OK mail
 250 OK rcpt
-250 OK nonlast bdat
-BDAT 823 LAST
-250 OK bdat
+400 not right now bdat
 QUIT
 225 OK
-Expected EOF read from client
 End of script