git://git.exim.org
/
exim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
cc00f4a
)
Testsuite: permit use of IPv6 loopback
author
Jeremy Harris
<jgh146exb@wizmail.org>
Wed, 18 Feb 2015 13:37:00 +0000
(13:37 +0000)
committer
Jeremy Harris
<jgh146exb@wizmail.org>
Wed, 18 Feb 2015 15:27:17 +0000
(15:27 +0000)
test/confs/5400
patch
|
blob
|
history
test/dnszones-src/db.test.ex
patch
|
blob
|
history
test/log/5400
patch
|
blob
|
history
test/runtest
patch
|
blob
|
history
test/scripts/4000-scanning/4001
patch
|
blob
|
history
test/scripts/5400-cutthrough/5400
patch
|
blob
|
history
test/stdout/4001
patch
|
blob
|
history
test/stdout/5400
patch
|
blob
|
history
diff --git
a/test/confs/5400
b/test/confs/5400
index 5948ce8d2f843a5cbe9a39b892caef79b3dc5ed9..79465df8064f3da9e703840c47db178ea9eccd8a 100644
(file)
--- a/
test/confs/5400
+++ b/
test/confs/5400
@@
-31,7
+31,7
@@
begin routers
dns:
driver = dnslookup
dns:
driver = dnslookup
- domains = localhost.test.ex : thishost.test.ex
+ domains = localhost.test.ex :
localhost4.test.ex :
thishost.test.ex
self = send
transport = smtp
self = send
transport = smtp
diff --git
a/test/dnszones-src/db.test.ex
b/test/dnszones-src/db.test.ex
index 4ec367cc9e4d9ce0fb06462725b68f7d3daf9761..fec2a0d781c96a7d000f9cbd91548b6ad1dc9cef 100644
(file)
--- a/
test/dnszones-src/db.test.ex
+++ b/
test/dnszones-src/db.test.ex
@@
-45,6
+45,8
@@
mx.π A V4NET.255.255.255
; A non-standard name for localhost
thishost A 127.0.0.1
; A non-standard name for localhost
thishost A 127.0.0.1
+localhost4 A 127.0.0.1
+
; Something that gives both the IP and the loopback
; Something that gives both the IP and the loopback
diff --git
a/test/log/5400
b/test/log/5400
index c6f366272056ebbc8c0b1fefeab95116b175c81a..a72dfeeadf5cc320f4b08b61e7b7f84a52b63dbe 100644
(file)
--- a/
test/log/5400
+++ b/
test/log/5400
@@
-46,9
+46,9
@@
1999-03-02 09:44:33 10HmbF-0005vi-00 => userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
1999-03-02 09:44:33 10HmbF-0005vi-00 => usery@special.com R=all T=smtp H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] C="250 OK"
1999-03-02 09:44:33 10HmbF-0005vi-00 Completed
1999-03-02 09:44:33 10HmbF-0005vi-00 => userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
1999-03-02 09:44:33 10HmbF-0005vi-00 => usery@special.com R=all T=smtp H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] C="250 OK"
1999-03-02 09:44:33 10HmbF-0005vi-00 Completed
-1999-03-02 09:44:33 rcpt for userx@localhost.test.ex
+1999-03-02 09:44:33 rcpt for userx@localhost
4
.test.ex
1999-03-02 09:44:33 rcpt for usery@thishost.test.ex
1999-03-02 09:44:33 rcpt for usery@thishost.test.ex
-1999-03-02 09:44:33 10HmbG-0005vi-00 >> usery@thishost.test.ex R=dns T=smtp H=localhost.test.ex [127.0.0.1] C="250 OK"
-1999-03-02 09:44:33 10HmbG-0005vi-00 >> userx@localhost
.test.ex R=dns T=smtp H=localhost
.test.ex [127.0.0.1] C="250 OK"
-1999-03-02 09:44:33 10HmbG-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss for userx@localhost.test.ex usery@thishost.test.ex
+1999-03-02 09:44:33 10HmbG-0005vi-00 >> usery@thishost.test.ex R=dns T=smtp H=localhost
4
.test.ex [127.0.0.1] C="250 OK"
+1999-03-02 09:44:33 10HmbG-0005vi-00 >> userx@localhost
4.test.ex R=dns T=smtp H=localhost4
.test.ex [127.0.0.1] C="250 OK"
+1999-03-02 09:44:33 10HmbG-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss for userx@localhost
4
.test.ex usery@thishost.test.ex
1999-03-02 09:44:33 10HmbG-0005vi-00 Completed
1999-03-02 09:44:33 10HmbG-0005vi-00 Completed
diff --git
a/test/runtest
b/test/runtest
index c6d9c729e22c4bc1cb61d6c12e0859f2bdff691b..2baf2cafd7950c94d930734a52ac912e906aef43 100755
(executable)
--- a/
test/runtest
+++ b/
test/runtest
@@
-1325,6
+1325,9
@@
$munges =
'optional_cert_hostnames' =>
{ 'stderr' => '/in tls_verify_cert_hostnames\? no/' },
'optional_cert_hostnames' =>
{ 'stderr' => '/in tls_verify_cert_hostnames\? no/' },
+ 'loopback' =>
+ { 'stdout' => 's/[[](127\.0\.0\.1|::1)]/[IP_LOOPBACK_ADDR]/' },
+
};
};
@@
-1342,7
+1345,7
@@
$munges =
# [4] TRUE if this is a log file whose deliveries must be sorted
# [5] an optional custom munge command
#
# [4] TRUE if this is a log file whose deliveries must be sorted
# [5] an optional custom munge command
#
-# Arguments: Optionally, name of a custom munge to run.
+# Arguments: Optionally, name of a
single
custom munge to run.
# Returns: 0 if the output compared equal
# 1 if re-run needed (files may have been updated)
# Returns: 0 if the output compared equal
# 1 if re-run needed (files may have been updated)
@@
-3405,6
+3408,7
@@
foreach $test (@test_list)
$stdout_skip = 0;
$rmfiltertest = 0;
$is_ipv6test = 0;
$stdout_skip = 0;
$rmfiltertest = 0;
$is_ipv6test = 0;
+ $TEST_STATE->{munge} = "";
# Remove the associative arrays used to hold checked mail files and msglogs
# Remove the associative arrays used to hold checked mail files and msglogs
diff --git
a/test/scripts/4000-scanning/4001
b/test/scripts/4000-scanning/4001
index 25a676e045e7cb770c33559f43e482e2e2330950..1dcbd1fbca9e6c3003b386d67318dd25a1894cf3 100644
(file)
--- a/
test/scripts/4000-scanning/4001
+++ b/
test/scripts/4000-scanning/4001
@@
-1,5
+1,7
@@
# content scan interface: f-protd
#
# content scan interface: f-protd
#
+munge loopback
+#
server PORT_S
<GET
<
server PORT_S
<GET
<
diff --git
a/test/scripts/5400-cutthrough/5400
b/test/scripts/5400-cutthrough/5400
index 79072d7491e74a3e7f9628fb182138255389ec3d..2d851a60d06cea26b3ece8c708c24a5f263548df 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
@@
-401,7
+402,7
@@
QUIT
exim -bs
EHLO myhost.test.ex
MAIL FROM:<CALLER@myhost.test.ex>
exim -bs
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
diff --git
a/test/stdout/4001
b/test/stdout/4001
index 40cf7a9d5a73c1afd3b68db29322e831e1b6f89c..6d66c7d648edcc81923827bb8d43f81e0b2af3ee 100644
(file)
--- a/
test/stdout/4001
+++ b/
test/stdout/4001
@@
-45,14
+45,14
@@
******** SERVER ********
Listening on port 1224 ...
******** SERVER ********
Listening on port 1224 ...
-Connection request from [
127.0.0.1
]
+Connection request from [
IP_LOOPBACK_ADDR
]
<GET TESTSUITE/spool/scan/10HmaZ-0005vi-00/10HmaZ-0005vi-00.eml HTTP/1.0
<
><summary code="11">
>*eof
End of script
Listening on port 1224 ...
<GET TESTSUITE/spool/scan/10HmaZ-0005vi-00/10HmaZ-0005vi-00.eml HTTP/1.0
<
><summary code="11">
>*eof
End of script
Listening on port 1224 ...
-Connection request from [
127.0.0.1
]
+Connection request from [
IP_LOOPBACK_ADDR
]
<GET TESTSUITE/spool/scan/10HmaX-0005vi-00/10HmaX-0005vi-00.eml HTTP/1.0
<
>
<GET TESTSUITE/spool/scan/10HmaX-0005vi-00/10HmaX-0005vi-00.eml HTTP/1.0
<
>
@@
-64,12
+64,12
@@
Connection request from [127.0.0.1]
>*eof
End of script
Listening on port 1224 ...
>*eof
End of script
Listening on port 1224 ...
-Connection request from [
127.0.0.1
]
+Connection request from [
IP_LOOPBACK_ADDR
]
<GET TESTSUITE/spool/scan/10HmaY-0005vi-00/10HmaY-0005vi-00.eml HTTP/1.0
*sleep 3
End of script
Listening on port 1224 ...
<GET TESTSUITE/spool/scan/10HmaY-0005vi-00/10HmaY-0005vi-00.eml HTTP/1.0
*sleep 3
End of script
Listening on port 1224 ...
-Connection request from [
127.0.0.1
]
+Connection request from [
IP_LOOPBACK_ADDR
]
<GET TESTSUITE/spool/scan/10HmbA-0005vi-00/10HmbA-0005vi-00.eml HTTP/1.0
*sleep 3
End of script
<GET TESTSUITE/spool/scan/10HmbA-0005vi-00/10HmbA-0005vi-00.eml HTTP/1.0
*sleep 3
End of script
diff --git
a/test/stdout/5400
b/test/stdout/5400
index 3452a9cc1f34d2a6386153b20826e95814a79f8e..05f2ef037735871fb2c1171f8ff61b7a720503f4 100644
(file)
--- a/
test/stdout/5400
+++ b/
test/stdout/5400
@@
-489,7
+489,7
@@
EHLO myhost.test.ex
250 OK
MAIL FROM:<CALLER@myhost.test.ex>
250 Sender OK
250 OK
MAIL FROM:<CALLER@myhost.test.ex>
250 Sender OK
-RCPT TO:<userx@localhost.test.ex>
+RCPT TO:<userx@localhost
4
.test.ex>
250 ok rcpt-1
RCPT TO:<usery@thishost.test.ex>
250 ok rcpt-2
250 ok rcpt-1
RCPT TO:<usery@thishost.test.ex>
250 ok rcpt-2