Merge branch 'master' into 4.next

[exim.git] / test / scripts / 0000-Basic / 0092

diff --git a/test/scripts/0000-Basic/0092 b/test/scripts/0000-Basic/0092
index d22feebb3653c02f1d880e65ebdc20bc1adbca92..f7ab4e42cdc141037782d70a68a79a50fabb8001 100644 (file)
--- a/test/scripts/0000-Basic/0092
+++ b/test/scripts/0000-Basic/0092
@@ -8,6 +8,7 @@
 # stdin-smtp, cmds then pause in dataphase, smtp command timeout 2s
 1
 3 exim -bs
 # stdin-smtp, cmds then pause in dataphase, smtp command timeout 2s
 1
 3 exim -bs

+helo test

 mail from: userx@test.ex
 rcpt to: userx@test.ex
 data
 mail from: userx@test.ex
 rcpt to: userx@test.ex
 data


@@ -21,6 +22,7 @@ data
 # stdin-smtp, cmds then pause in dataphase, smtp command timeout 2s
 1
 3 exim -bh V4NET.0.0.1
 # stdin-smtp, cmds then pause in dataphase, smtp command timeout 2s
 1
 3 exim -bh V4NET.0.0.1

+helo test

 mail from:userx@test.ex
 rcpt to:userx@test.ex
 data
 mail from:userx@test.ex
 rcpt to:userx@test.ex
 data


@@ -31,6 +33,7 @@ The quick brown fox
 # late-expansion of smtp_receive_timeout
 1
 3 exim -d+expand '-DOPT=${if eq {V4NET.0.0.1} {$sender_host_address} {2} {30}}s' -bh V4NET.0.0.1
 # late-expansion of smtp_receive_timeout
 1
 3 exim -d+expand '-DOPT=${if eq {V4NET.0.0.1} {$sender_host_address} {2} {30}}s' -bh V4NET.0.0.1

+helo test

 mail from:userx@test.ex
 rcpt to:userx@test.ex
 data
 mail from:userx@test.ex
 rcpt to:userx@test.ex
 data


@@ -52,6 +55,7 @@ jumps over the lazy dog.
 # stdin-smtp, cmds then pause before dataphase, smtp command timeout 2s
 1
 3 exim -bh V4NET.0.0.1
 # stdin-smtp, cmds then pause before dataphase, smtp command timeout 2s
 1
 3 exim -bh V4NET.0.0.1

+helo test

 mail from: userx@test.ex
 rcpt to: verify@test.ex
 **** 
 mail from: userx@test.ex
 rcpt to: verify@test.ex
 ****