X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/59371ea735c941334861aa5b8e1e9a06facf044f..b9ecb570888756a645781505fbcd1b70c93216a5:/test/scripts/0000-Basic/0021

diff --git a/test/scripts/0000-Basic/0021 b/test/scripts/0000-Basic/0021
index 2ec354ffd..298013341 100644
--- a/test/scripts/0000-Basic/0021
+++ b/test/scripts/0000-Basic/0021
@@ -24,7 +24,9 @@ Test message 5.
 ****
 exim -bs -oMa 10.9.8.7
 ****
-exim -d-all+acl+lists -bs -oMa 10.9.8.8
+exim -DLOG_SELECTOR=-connection_reject -bs -oMa 10.9.8.7
+****
+exim -d-all+acl+lists -DHVH=hosts_require_helo=: -bs -oMa 10.9.8.8
 mail from:<bad@test1>
 mail from:<ok@test1>
 rcpt to:<x@y>
@@ -40,11 +42,41 @@ exim -bs -oMa 10.9.8.10
 helo x.y.z
 quit
 ****
-exim -d-all+acl+lists -odi -bs -oMa 10.9.8.8
+exim -d-all+acl+lists -DHVH=hosts_require_helo=: -odi -bs -oMa 10.9.8.8
 mail from:<ok@test3>
 rcpt to:<x@y>
 data
+
 Some message
 .
 quit
 ****
+# Test unsetting bounce_return_message for non-SMTP
+1
+exim -DBR=no_bounce_return_message -odi -f userx@test1 userx
+Test message 1.
+.
+****
+# Test unsetting bounce_return_body for non-SMTP
+1
+exim -DBR=no_bounce_return_body -odi -f userx@test1 userx
+Test message 1.
+.
+****
+exim -DHVH=hosts_require_helo=: -odi -bs -oMa 10.9.8.8
+ehlo test.ex
+mail from: <ok@test3> SIZE=1234
+rcpt to:<x@y>
+data
+Some message
+.
+quit
+****
+#
+# Test returncode and logging for no extractable recipients
+1
+exim -odi -t
+From: userx@test1
+To:
+Subject: this should get a bounce, too
+****