Testsuite: fix testcase for SPF empty-mailfrom-use-helo. Bug 467

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

diff --git a/test/scripts/0000-Basic/0092 b/test/scripts/0000-Basic/0092
index 78c713e1c0456a4f036a638487bef9c7db507118..d22feebb3653c02f1d880e65ebdc20bc1adbca92 100644 (file)
--- a/test/scripts/0000-Basic/0092
+++ b/test/scripts/0000-Basic/0092
@@ -1,16 +1,24 @@
 # SMTP incoming timeout + receive_timeout
 # SMTP incoming timeout + receive_timeout

+#
+# stdin-smtp, no cmds, smtp command timeout 2s

 1
 3 exim -bs
 ****
 1
 3 exim -bs
 ****

+#
+# stdin-smtp, cmds then pause in dataphase, smtp command timeout 2s

 1
 3 exim -bs
 mail from: userx@test.ex
 rcpt to: userx@test.ex
 data
 ****
 1
 3 exim -bs
 mail from: userx@test.ex
 rcpt to: userx@test.ex
 data
 ****

+#
+# stdin-smtp, no cmds, smtp command timeout 2s

 1
 3 exim -bh V4NET.0.0.1
 ****
 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
 mail from:userx@test.ex
 1
 3 exim -bh V4NET.0.0.1
 mail from:userx@test.ex


@@ -18,24 +26,63 @@ rcpt to:userx@test.ex
 data
 The quick brown fox
 ****
 data
 The quick brown fox
 ****

+#
+# stdin-smtp, cmds then pause in dataphase, smtp command timeout 2s
+# 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
+mail from:userx@test.ex
+rcpt to:userx@test.ex
+data
+The quick brown fox
+****
+#
+# cmdline mail, no stdin, receive_timeout 2s

 1
 3 exim userx@test.ex
 ****
 1
 3 exim userx@test.ex
 ****

+#
+# cmdline mail, some data then pause, receive_timeout 2s

 1
 3 exim userx@test.ex
 The quick brown fox
 jumps over the lazy dog.
 ****
 1
 3 exim userx@test.ex
 The quick brown fox
 jumps over the lazy dog.
 ****

+#
+# stdin-smtp, cmds then pause before dataphase, smtp command timeout 2s

 1
 3 exim -bh V4NET.0.0.1
 mail from: userx@test.ex
 rcpt to: verify@test.ex
 **** 
 1
 3 exim -bh V4NET.0.0.1
 mail from: userx@test.ex
 rcpt to: verify@test.ex
 **** 

+#
+# stdin-bsmtp, no stdin, smtp command timeout 2s

 2
 3 exim -bS
 ****
 2
 3 exim -bS
 ****

+#
+# stdin-bsmtp, some data then pause, smtp command timeout 2s

 2
 3 exim -bS
 mail from: userx@test.ex
 rcpt to: userx@test.ex
 data
 2
 3 exim -bS
 mail from: userx@test.ex
 rcpt to: userx@test.ex
 data

+****
+#
+# stdin-smtp, no cmds, smtp command timeout 2s set by cmdline
+1
+3 exim -DCOM=y -bs -os 2s
+****
+1
+3 exim -DCOM=y -os 2s -bs
+****
+#
+# cmdline mail, no stdin, receive_timeout 2s set by cmdline
+1
+3 exim -DCOM=y -or 2s userx@test.ex
+****
+#
+# stdin-bsmtp, no stdin, receive_timeout 2s set by cmdline
+# should not timeout
+3 exim -DCOM=y -bS -or 2s
+****