git://git.exim.org
/
users
/
heiko
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Testsuite: avoid IPv6 interfaces to avoid extra debug stderr lines
[users/heiko/exim.git]
/
test
/
scripts
/
5400-cutthrough
/
5400
diff --git
a/test/scripts/5400-cutthrough/5400
b/test/scripts/5400-cutthrough/5400
index 79072d7491e74a3e7f9628fb182138255389ec3d..5344ba51c6db4cd77ce0bbb5bd3f42be580a2405 100644
(file)
--- a/
test/scripts/5400-cutthrough/5400
+++ b/
test/scripts/5400-cutthrough/5400
@@
-1,5
+1,6
@@
# cutthrough_delivery basic operation
need_ipv4
# cutthrough_delivery basic operation
need_ipv4
+munge loopback
#
server PORT_S
220 ESMTP
#
server PORT_S
220 ESMTP
@@
-148,7
+149,10
@@
DATA
QUIT
250 OK
****
QUIT
250 OK
****
-exim -bs
+#
+# Foregound delivery needed else the following subtest reception logging happens before this ones
+# delivery process logs and terminates; the interlock is only on the parent exim terminating.
+exim -bs -odf
EHLO myhost.test.ex
MAIL FROM:<CALLER@myhost.test.ex>
RCPT TO:<no@domain.com>
EHLO myhost.test.ex
MAIL FROM:<CALLER@myhost.test.ex>
RCPT TO:<no@domain.com>
@@
-162,7
+166,6
@@
QUIT
#
#
#
#
#
#
-#
# cutthrough for 2 recipients in one domain
# second one denied
# so we get a 2nd conn with the traditional delivery
# cutthrough for 2 recipients in one domain
# second one denied
# so we get a 2nd conn with the traditional delivery
@@
-196,7
+199,7
@@
DATA
QUIT
250 OK
****
QUIT
250 OK
****
-exim -bs
+exim -bs
-odf
EHLO myhost.test.ex
MAIL FROM:<CALLER@myhost.test.ex>
RCPT TO:<userx@domain.com>
EHLO myhost.test.ex
MAIL FROM:<CALLER@myhost.test.ex>
RCPT TO:<userx@domain.com>
@@
-264,7
+267,7
@@
DATA
QUIT
250 OK
****
QUIT
250 OK
****
-exim -bs
+exim -bs
-odf
EHLO myhost.test.ex
MAIL FROM:<CALLER@myhost.test.ex>
RCPT TO:<userx@domain.com>
EHLO myhost.test.ex
MAIL FROM:<CALLER@myhost.test.ex>
RCPT TO:<userx@domain.com>
@@
-364,7
+367,7
@@
DATA
QUIT
250 OK
****
QUIT
250 OK
****
-exim -bs
+exim -bs
-odf
EHLO myhost.test.ex
MAIL FROM:<CALLER@myhost.test.ex>
RCPT TO:<userx@domain.com>
EHLO myhost.test.ex
MAIL FROM:<CALLER@myhost.test.ex>
RCPT TO:<userx@domain.com>
@@
-398,10
+401,10
@@
DATA
QUIT
250 OK
****
QUIT
250 OK
****
-exim -bs
+exim -bs
-odf
EHLO myhost.test.ex
MAIL FROM:<CALLER@myhost.test.ex>
EHLO myhost.test.ex
MAIL FROM:<CALLER@myhost.test.ex>
-RCPT TO:<userx@localhost.test.ex>
+RCPT TO:<userx@localhost
4
.test.ex>
RCPT TO:<usery@thishost.test.ex>
DATA
RCPT TO:<usery@thishost.test.ex>
DATA
@@
-412,5
+415,4
@@
QUIT
#
#
#
#
#
#
-#
-sleep 1
+# End