From 493e0e6648552c0dce6c5225c8438d2829f1ac11 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Tue, 4 Oct 2016 00:11:32 +0100 Subject: Testsuite: for CHUNKING set sender name explicitly for consistent chunk size on different platforms --- test/scripts/0000-Basic/0901 | 156 ++++++++++++++++++++++++++++++++----------- test/scripts/0000-Basic/0902 | 109 ++++++++++++++++++++++-------- 2 files changed, 199 insertions(+), 66 deletions(-) (limited to 'test/scripts/0000-Basic') diff --git a/test/scripts/0000-Basic/0901 b/test/scripts/0000-Basic/0901 index 53d8a9afb..2157e61a8 100644 --- a/test/scripts/0000-Basic/0901 +++ b/test/scripts/0000-Basic/0901 @@ -12,17 +12,23 @@ MAIL FROM 250 OK RCPT TO 250 OK -BDAT 346 LAST -*data 346 +BDAT 329 LAST +*data 329 250 OK QUIT 225 OK *eof **** -exim -odf a@test.ex +sudo exim -odf -bS +EHLO test +MAIL FROM: +RCPT TO: +DATA Subject: foo data +. +QUIT **** # # Error case: server wrongly expected more data, client gets timeout for data-ack @@ -35,16 +41,22 @@ MAIL FROM 250 good mail cmd RCPT TO 250 acceptable rcpt cmd -BDAT 346 LAST -*data 347 +BDAT 329 LAST +*data 330 250 OK got that data QUIT 225 OK quitting **** -exim -odf b@test.ex +sudo exim -odf -bS +EHLO test +MAIL FROM: +RCPT TO: +DATA Subject: foo data +. +QUIT **** # # Error case: server wrongly expected less data @@ -59,16 +71,22 @@ MAIL FROM 250 OK RCPT TO 250 OK -BDAT 346 LAST -*data 345 +BDAT 329 LAST +*data 328 250 OK QUIT 225 OK **** -exim -odf c@test.ex +sudo exim -odf -bS +EHLO test +MAIL FROM: +RCPT TO: +DATA Subject: foo data +. +QUIT **** # # server rejects BDAT cmd @@ -81,16 +99,22 @@ MAIL FROM 250 OK RCPT TO 250 OK -BDAT 346 LAST -*data 346 +BDAT 329 LAST +*data 329 500 oops QUIT 225 OK **** -exim -odf d@test.ex +sudo exim -odf -bS +EHLO test +MAIL FROM: +RCPT TO: +DATA Subject: foo data +. +QUIT **** # # server tmp-rejects BDAT cmd @@ -103,16 +127,22 @@ MAIL FROM 250 OK RCPT TO 250 OK -BDAT 346 LAST -*data 346 +BDAT 329 LAST +*data 329 400 not right now QUIT 225 OK **** -exim -odf e@test.ex +sudo exim -odf -bS +EHLO test +MAIL FROM: +RCPT TO: +DATA Subject: foo data +. +QUIT **** # # @@ -129,8 +159,8 @@ EHLO 250 CHUNKING MAIL FROM RCPT TO -BDAT 346 LAST -*data 346 +BDAT 329 LAST +*data 329 250 OK mail 250 OK rcpt 250 OK bdat @@ -138,10 +168,16 @@ QUIT 225 OK *eof **** -exim -odf p@test.ex +sudo exim -odf -bS +EHLO test +MAIL FROM: +RCPT TO: +DATA Subject: foo data +. +QUIT **** # # Error case: server wrongly expected more data, client gets timeout for data-ack @@ -153,14 +189,20 @@ EHLO 250 CHUNKING MAIL FROM RCPT TO -BDAT 346 LAST -*data 347 +BDAT 329 LAST +*data 330 250 good mail cmd **** -exim -odf q@test.ex +sudo exim -odf -bS +EHLO test +MAIL FROM: +RCPT TO: +DATA Subject: foo data +. +QUIT **** # # Error case: server wrongly expected less data @@ -174,18 +216,24 @@ EHLO 250 CHUNKING MAIL FROM RCPT TO -BDAT 346 LAST -*data 345 +BDAT 329 LAST +*data 328 250 OK mail 250 OK rcpt 250 OK bdat QUIT 225 OK **** -exim -odf r@test.ex +sudo exim -odf -bS +EHLO test +MAIL FROM: +RCPT TO: +DATA Subject: foo data +. +QUIT **** # # server rejects MAIL cmd @@ -199,18 +247,24 @@ EHLO 250 CHUNKING MAIL FROM RCPT TO -BDAT 346 LAST -*data 346 +BDAT 329 LAST +*data 329 550 unacceptable mail-from 550 rcpt ungood lacking mail-from 500 bdat ungood lacking mail-from QUIT 225 OK **** -exim -odf s@test.ex +sudo exim -odf -bS +EHLO test +MAIL FROM: +RCPT TO: +DATA Subject: foo data +. +QUIT **** # # server tmp-rejects MAIL cmd @@ -222,18 +276,24 @@ EHLO 250 CHUNKING MAIL FROM RCPT TO -BDAT 347 LAST -*data 347 +BDAT 330 LAST +*data 330 450 greylisted mail-from 550 rcpt ungood lacking mail-from 500 bdat ungood lacking mail-from QUIT 225 OK **** -exim -odf s1@test.ex +sudo exim -odf -bS +EHLO test +MAIL FROM: +RCPT TO: +DATA Subject: foo data +. +QUIT **** # # server rejects RCPT cmd @@ -245,18 +305,24 @@ EHLO 250 CHUNKING MAIL FROM RCPT TO -BDAT 346 LAST -*data 346 +BDAT 329 LAST +*data 329 250 OK mail 550 no such recipient 500 oops bdat QUIT 225 OK **** -exim -odf t@test.ex +sudo exim -odf -bS +EHLO test +MAIL FROM: +RCPT TO: +DATA Subject: foo data +. +QUIT **** # # server rejects BDAT cmd @@ -268,18 +334,24 @@ EHLO 250 CHUNKING MAIL FROM RCPT TO -BDAT 346 LAST -*data 346 +BDAT 329 LAST +*data 329 250 OK mail 250 OK rcpt 500 oops bdat QUIT 225 OK **** -exim -odf u@test.ex +sudo exim -odf -bS +EHLO test +MAIL FROM: +RCPT TO: +DATA Subject: foo data +. +QUIT **** # # server tmp-rejects BDAT cmd @@ -291,18 +363,24 @@ EHLO 250 CHUNKING MAIL FROM RCPT TO -BDAT 346 LAST -*data 346 +BDAT 329 LAST +*data 329 250 OK mail 250 OK rcpt 400 not right now bdat QUIT 225 OK **** -exim -odf v@test.ex +sudo exim -odf -bS +EHLO test +MAIL FROM: +RCPT TO: +DATA Subject: foo data +. +QUIT **** # # diff --git a/test/scripts/0000-Basic/0902 b/test/scripts/0000-Basic/0902 index ebc275c1f..5be294087 100644 --- a/test/scripts/0000-Basic/0902 +++ b/test/scripts/0000-Basic/0902 @@ -12,8 +12,8 @@ MAIL FROM 250 OK RCPT TO 250 OK -BDAT 340 -*data 340 +BDAT 295 +*data 295 250 OK nonlast bdat BDAT 8380 LAST *data 8380 @@ -22,7 +22,11 @@ QUIT 225 OK *eof **** -exim -odf a@test.ex +sudo exim -odf -bS +EHLO +MAIL FROM: +RCPT TO: +DATA Subject: foo 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 @@ -115,6 +119,8 @@ Subject: foo 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +. +QUIT **** # # @@ -128,13 +134,17 @@ MAIL FROM 250 OK RCPT TO 250 OK -BDAT 340 -*data 340 +BDAT 295 +*data 295 500 oops bdat-nonlast QUIT 225 OK **** -exim -odf d@test.ex +sudo exim -odf -bS +EHLO +MAIL FROM: +RCPT TO: +DATA Subject: foo 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 @@ -227,6 +237,8 @@ Subject: foo 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +. +QUIT **** # # @@ -243,10 +255,10 @@ EHLO 250 CHUNKING MAIL FROM RCPT TO -BDAT 340 +BDAT 295 250 OK mail 250 OK rcpt -*data 340 +*data 295 250 OK nonlast bdat BDAT 8380 LAST *data 8380 @@ -255,7 +267,11 @@ QUIT 225 OK *eof **** -exim -odf p@test.ex +sudo exim -odf -bS +EHLO +MAIL FROM: +RCPT TO: +DATA Subject: foo 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 @@ -348,6 +364,8 @@ Subject: foo 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +. +QUIT **** # # server rejects MAIL cmd @@ -362,15 +380,19 @@ EHLO 250 CHUNKING MAIL FROM RCPT TO -BDAT 340 -*data 340 +BDAT 295 +*data 295 550 unacceptable mail-from 550 rcpt ungood lacking mail-from 500 bdat (nonlast) ungood lacking mail-from QUIT 225 OK **** -exim -odf s@test.ex +sudo exim -odf -bS +EHLO +MAIL FROM: +RCPT TO: +DATA Subject: foo 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 @@ -463,6 +485,8 @@ Subject: foo 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +. +QUIT **** # # server rejects RCPT cmd @@ -474,15 +498,19 @@ EHLO 250 CHUNKING MAIL FROM RCPT TO -BDAT 340 -*data 340 +BDAT 295 +*data 295 250 OK mail 550 no such recipient 500 oops nonlast bdat - no rcpt QUIT 225 OK **** -exim -odf t@test.ex +sudo exim -odf -bS +EHLO +MAIL FROM: +RCPT TO: +DATA Subject: foo 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 @@ -575,6 +603,8 @@ Subject: foo 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +. +QUIT **** # # server rejects 1st RCPT cmd of two @@ -587,8 +617,8 @@ EHLO MAIL FROM RCPT TO RCPT TO -BDAT 324 -*data 324 +BDAT 279 +*data 279 250 OK mail 550 no such recipient 250 good recipient @@ -599,7 +629,12 @@ BDAT 8380 LAST QUIT 225 OK **** -exim -odf t1@test.ex t2@test.ex +sudo exim -odf -bS +EHLO +MAIL FROM: +RCPT TO: +RCPT TO: +DATA Subject: foo 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 @@ -692,6 +727,8 @@ Subject: foo 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +. +QUIT **** # # server rejects initial BDAT cmd @@ -703,15 +740,19 @@ EHLO 250 CHUNKING MAIL FROM RCPT TO -BDAT 340 -*data 340 +BDAT 295 +*data 295 250 OK mail 250 OK rcpt 500 oops nonlast bdat QUIT 225 OK **** -exim -odf u@test.ex +sudo exim -odf -bS +EHLO +MAIL FROM: +RCPT TO: +DATA Subject: foo 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 @@ -804,6 +845,8 @@ Subject: foo 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +. +QUIT **** # # server rejects final BDAT cmd @@ -815,8 +858,8 @@ EHLO 250 CHUNKING MAIL FROM RCPT TO -BDAT 340 -*data 340 +BDAT 295 +*data 295 250 OK mail 250 OK rcpt 250 OK nonlast bdat @@ -826,7 +869,11 @@ BDAT 8380 LAST QUIT 225 OK **** -exim -odf v@test.ex +sudo exim -odf -bS +EHLO +MAIL FROM: +RCPT TO: +DATA Subject: foo 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 @@ -919,6 +966,8 @@ Subject: foo 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +. +QUIT **** # # message with long headers @@ -935,14 +984,18 @@ BDAT 8191 250 OK rcpt *data 8191 250 OK nonlast bdat -BDAT 852 LAST -*data 852 +BDAT 807 LAST +*data 807 250 OK bdat QUIT 225 OK *eof **** -exim -odf p@test.ex +sudo exim -odf -bS +EHLO +MAIL FROM: +RCPT TO: +DATA Subject: foo X-long_hdr: 0 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 @@ -1039,6 +1092,8 @@ X-long_hdr: 0 body 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 +. +QUIT **** # # -- cgit v1.2.3