Merge branch '4.next'

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

diff --git a/test/scripts/0000-Basic/0580 b/test/scripts/0000-Basic/0580
index 8d8a11751d43ae48eb8cf080daf9897e1f1a99e1..4d216677af913079d1ed42eddc5bb1cbc7af16ff 100644 (file)
--- a/test/scripts/0000-Basic/0580
+++ b/test/scripts/0000-Basic/0580
@@ -19,7 +19,8 @@ QUIT
 221 Bye
 ****
 #
 221 Bye
 ****
 #

-exim -bs
+exim -bs -odi
+helo test

 mail from:<userx@ok.example>
 rcpt to:<usery@test.ex>
 data
 mail from:<userx@ok.example>
 rcpt to:<usery@test.ex>
 data


@@ -29,7 +30,6 @@ body
 .
 quit
 ****
 .
 quit
 ****

-sleep 1

 #
 #
 # multiple recipients
 #
 #
 # multiple recipients


@@ -62,7 +62,8 @@ QUIT
 221 Bye
 ****
 #
 221 Bye
 ****
 #

-exim -bs
+exim -bs -odi
+helo test

 mail from:<userx@ok.example>
 rcpt to:<usery@test.ex>
 rcpt to:<usery2@test.ex>
 mail from:<userx@ok.example>
 rcpt to:<usery@test.ex>
 rcpt to:<usery2@test.ex>


@@ -73,7 +74,6 @@ body
 .
 quit
 ****
 .
 quit
 ****

-sleep 1

 #
 #
 # 2nd callout result is cached (above); should not activate LCC
 #
 #
 # 2nd callout result is cached (above); should not activate LCC


@@ -105,7 +105,8 @@ QUIT
 221 Bye
 ****
 #
 221 Bye
 ****
 #

-exim -bs
+exim -bs -odi
+helo test

 mail from:<userx@ok.example>
 rcpt to:<usery3@test.ex>
 rcpt to:<usery@test.ex>
 mail from:<userx@ok.example>
 rcpt to:<usery3@test.ex>
 rcpt to:<usery@test.ex>


@@ -116,7 +117,6 @@ body
 .
 quit
 ****
 .
 quit
 ****

-sleep 1

 #
 #
 # no cache hits; should do LCC
 #
 #
 # no cache hits; should do LCC


@@ -138,7 +138,8 @@ QUIT
 221 Bye
 ****
 #
 221 Bye
 ****
 #

-exim -bs
+exim -bs -odi
+helo test

 mail from:<userx@ok.example>
 rcpt to:<usery4@test.ex>
 rcpt to:<usery5@test.ex>
 mail from:<userx@ok.example>
 rcpt to:<usery4@test.ex>
 rcpt to:<usery5@test.ex>


@@ -149,8 +150,34 @@ body
 .
 quit
 ****
 .
 quit
 ****

-sleep 1

 #
 #

+# cmdline -bs send, rmt conn timeout, also local rcpt
+server PORT_S
+220 Welcome
+EHLO
+250 Hi
+MAIL FROM
+250 OK 
+RCPT TO
+250 OK
+DATA
+354 hit me
+.
+250 message accepted
+QUIT
+221 bye
+****
+exim -bs -odi
+helo test
+mail from:<useri@ok.example>
+rcpt to:<remote@test.ex>
+rcpt to:<local@test.ex>
+data
+Subject: test
+.
+quit
+****
+exim -bp
+****

 #
 #

-no_stdout_check

 no_msglog_check
 no_msglog_check