[exim-cvs] Testsuite: output changes arising

Gitweb: https://git.exim.org/exim.git/commitdiff/a40f593b6106dcb1b01d9528838709c4cd20f030

Commit:     a40f593b6106dcb1b01d9528838709c4cd20f030
Parent:     9c5e54499afef5167bee6ecdcbf8dd5f023f51e0
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Sat Feb 2 15:35:14 2019 +0000
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Sat Feb 2 15:38:25 2019 +0000

    Testsuite: output changes arising

    Broken-by: 9e160d8100
---
 test/stderr/1000 | 12 ++++++------
 test/stderr/1002 |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/test/stderr/1000 b/test/stderr/1000
index efd8de9..89a6d2f 100644
--- a/test/stderr/1000
+++ b/test/stderr/1000
@@ -7,13 +7,13 @@
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
>>> using ACL "check_connect"
->>> processing "warn"
+>>> processing "warn" (TESTSUITE/test-config 21)
>>> l_message: matched hostlist
>>> check hosts = <; 2001:ab8:37f:20:0:0:0:1 ; v6.test.ex
>>> host in "<; 2001:ab8:37f:20:0:0:0:1 ; v6.test.ex"? yes (matched "2001:ab8:37f:20:0:0:0:1")
>>> warn: condition test succeeded in ACL "check_connect"
LOG: H=[2001:0ab8:037f:0020:0000:0000:0000:0001] Warning: matched hostlist
->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 24)

 >>> check condition = ${if eq{$sender_host_address}{2001:0ab8:037f:0020:0000:0000:0000:0001}}
 >>>                 = true
 >>> accept: condition test succeeded in ACL "check_connect"

@@ -31,7 +31,7 @@ LOG: H=[2001:0ab8:037f:0020:0000:0000:0000:0001] Warning: matched hostlist
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
>>> using ACL "check_connect"
->>> processing "warn"
+>>> processing "warn" (TESTSUITE/test-config 21)
>>> l_message: matched hostlist
>>> check hosts = <; 2001:ab8:37f:20:0:0:0:1 ; v6.test.ex
MUNGED: ::1 will be omitted in what follows
@@ -39,7 +39,7 @@ MUNGED: ::1 will be omitted in what follows
>>> name=v6.test.ex address=V6NET:ffff:836f:a00:a:800:200a:c032
>>> host in "<; 2001:ab8:37f:20:0:0:0:1 ; v6.test.ex"? no (end of list)
>>> warn: condition test failed in ACL "check_connect"
->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 24)

 >>> check condition = ${if eq{$sender_host_address}{2001:0ab8:037f:0020:0000:0000:0000:0001}}
 >>>                 = 
 >>> accept: condition test failed in ACL "check_connect"

@@ -54,7 +54,7 @@ LOG: H=test3.ipv6.test.ex [V6NET:1234:0005:0006:0007:0008:0abc:000d] rejected co
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
>>> using ACL "check_connect"
->>> processing "warn"
+>>> processing "warn" (TESTSUITE/test-config 21)
>>> l_message: matched hostlist
>>> check hosts = <; 2001:ab8:37f:20:0:0:0:1 ; v6.test.ex
MUNGED: ::1 will be omitted in what follows
@@ -63,7 +63,7 @@ MUNGED: ::1 will be omitted in what follows
>>> host in "<; 2001:ab8:37f:20:0:0:0:1 ; v6.test.ex"? yes (matched "v6.test.ex")
>>> warn: condition test succeeded in ACL "check_connect"
LOG: H=[V6NET:ffff:836f:0a00:000a:0800:200a:c032] Warning: matched hostlist
->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 24)

 >>> check condition = ${if eq{$sender_host_address}{2001:0ab8:037f:0020:0000:0000:0000:0001}}
 >>>                 = 
 >>> accept: condition test failed in ACL "check_connect"

diff --git a/test/stderr/1002 b/test/stderr/1002
index d65fff6..d01a05d 100644
--- a/test/stderr/1002
+++ b/test/stderr/1002
@@ -7,16 +7,16 @@
>>> host in helo_try_verify_hosts? no (option unset)
>>> host in helo_accept_junk_hosts? no (option unset)
>>> using ACL "acl_rcpt_1"
->>> processing "require"
+>>> processing "require" (TESTSUITE/test-config 19)
>>> message: domain doesn't match @ or @[]
>>> check domains = @ : @[]
>>> [::1] in "@ : @[]"? yes (matched "@[]")
>>> require: condition test succeeded in ACL "acl_rcpt_1"
->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 21)
>>> accept: condition test succeeded in ACL "acl_rcpt_1"
>>> end of ACL "acl_rcpt_1": ACCEPT
>>> using ACL "acl_rcpt_6"
->>> processing "require"
+>>> processing "require" (TESTSUITE/test-config 44)
>>> message: domain doesn't match @mx_any/ignore=<;127.0.0.1;::1
>>> check domains = <+ @mx_any/ignore=<;127.0.0.1;::1
>>> ::1 in "<;127.0.0.1;::1"? yes (matched "::1")