summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2018-03-31 14:21:36 +0100
committerJeremy Harris <jgh146exb@wizmail.org>2018-03-31 14:21:36 +0100
commitd202d925afe3876b8f8f6e16b209ac89c09653e3 (patch)
tree5243893471689ab41f637083695363492e7007d0 /test
parentd3e58fcb87faf7131a2712fcfaef200ffd191f05 (diff)
Testsuite: output changes arising
Diffstat (limited to 'test')
-rwxr-xr-xtest/runtest1
-rw-r--r--test/stderr/00226
-rw-r--r--test/stderr/02752
-rw-r--r--test/stderr/02782
-rw-r--r--test/stderr/02944
-rw-r--r--test/stderr/03034
-rw-r--r--test/stderr/03174
-rw-r--r--test/stderr/03612
-rw-r--r--test/stderr/03712
-rw-r--r--test/stderr/03864
-rw-r--r--test/stderr/03882
-rw-r--r--test/stderr/04022
-rw-r--r--test/stderr/04032
-rw-r--r--test/stderr/04044
-rw-r--r--test/stderr/04082
15 files changed, 1 insertions, 42 deletions
diff --git a/test/runtest b/test/runtest
index 8925731d2..38d519c2e 100755
--- a/test/runtest
+++ b/test/runtest
@@ -1560,6 +1560,7 @@ $munges =
dkim_(canon|domain|private_key|selector|sign_headers|strict|hash|identity)
|gnutls_require_(kx|mac|protocols)
|hosts_(requ(est|ire)|try)_(dane|ocsp)
+ |dane_require_tls_ciphers
|hosts_(avoid|nopass|noproxy|require|verify_avoid)_tls
|socks_proxy
|tls_[^ ]*
diff --git a/test/stderr/0022 b/test/stderr/0022
index c558b4226..02844f983 100644
--- a/test/stderr/0022
+++ b/test/stderr/0022
@@ -53,8 +53,6 @@ P Received: from [V4NET.9.8.7]
(envelope-from <x@y>)
id 10HmbF-0005vi-00
for warn_empty@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-calling local_scan(); timeout=300
-local_scan() returned 0 NULL
LOG: MAIN
<= x@y H=[V4NET.9.8.7] P=smtp S=sss
SMTP>> 250 OK id=10HmbF-0005vi-00
@@ -123,8 +121,6 @@ P Received: from [V4NET.9.8.7]
(envelope-from <x@y>)
id 10HmbG-0005vi-00
for warn_log@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-calling local_scan(); timeout=300
-local_scan() returned 0 NULL
LOG: MAIN
<= x@y H=[V4NET.9.8.7] P=smtp S=sss
SMTP>> 250 OK id=10HmbG-0005vi-00
@@ -194,8 +190,6 @@ P Received: from [V4NET.9.8.7]
>>Headers added by MAIL or RCPT ACL:
X-ACL-Warn: warn user message
>>
-calling local_scan(); timeout=300
-local_scan() returned 0 NULL
LOG: MAIN
<= x@y H=[V4NET.9.8.7] P=smtp S=sss
SMTP>> 250 OK id=10HmbH-0005vi-00
diff --git a/test/stderr/0275 b/test/stderr/0275
index 7b652cc38..2d3a46be5 100644
--- a/test/stderr/0275
+++ b/test/stderr/0275
@@ -132,8 +132,6 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
(envelope-from <CALLER@test.ex>)
id 10HmaX-0005vi-00
for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-calling local_scan(); timeout=300
-local_scan() returned 0 NULL
Writing spool header file: TESTSUITE/spool//input//hdr.pppp
DSN: Write SPOOL :-dsn_envid NULL
DSN: Write SPOOL :-dsn_ret 0
diff --git a/test/stderr/0278 b/test/stderr/0278
index c028b6581..1d3628ce3 100644
--- a/test/stderr/0278
+++ b/test/stderr/0278
@@ -91,8 +91,6 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz)
(envelope-from <CALLER@test.ex>)
id 10HmaX-0005vi-00
for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-calling local_scan(); timeout=300
-local_scan() returned 0 NULL
Writing spool header file: TESTSUITE/spool//input//hdr.pppp
DSN: Write SPOOL :-dsn_envid NULL
DSN: Write SPOOL :-dsn_ret 0
diff --git a/test/stderr/0294 b/test/stderr/0294
index f4cd59269..8ade497a7 100644
--- a/test/stderr/0294
+++ b/test/stderr/0294
@@ -46,8 +46,6 @@ Data file written for message 10HmaX-0005vi-00
P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
(envelope-from <x@y>)
id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-calling local_scan(); timeout=300
-local_scan() returned 0 NULL
Writing spool header file: TESTSUITE/spool//input//hdr.pppp
Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H
Size of headers = sss
@@ -80,8 +78,6 @@ P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
(envelope-from <x@y>)
id 10HmaY-0005vi-00
for two@z; Tue, 2 Mar 1999 09:44:33 +0000
-calling local_scan(); timeout=300
-local_scan() returned 0 NULL
Writing spool header file: TESTSUITE/spool//input//hdr.pppp
Renaming spool header file: TESTSUITE/spool//input//10HmaY-0005vi-00-H
Size of headers = sss
diff --git a/test/stderr/0303 b/test/stderr/0303
index edf35c14f..2b2df1ae9 100644
--- a/test/stderr/0303
+++ b/test/stderr/0303
@@ -101,8 +101,6 @@ P Received: from [V4NET.2.3.4]
by myhost.test.ex with esmtp (Exim x.yz)
id 10HmaX-0005vi-00
for x@y; Tue, 2 Mar 1999 09:44:33 +0000
-calling local_scan(); timeout=300
-local_scan() returned 0 NULL
LOG: MAIN
<= <> H=([V4NET.2.3.4]) [V4NET.2.3.4] P=esmtp S=sss
SMTP>> 250 OK id=10HmaX-0005vi-00
@@ -177,8 +175,6 @@ P Received: from host.name.tld ([V4NET.2.3.4])
by myhost.test.ex with esmtp (Exim x.yz)
id 10HmaY-0005vi-00
for x@y; Tue, 2 Mar 1999 09:44:33 +0000
-calling local_scan(); timeout=300
-local_scan() returned 0 NULL
LOG: MAIN
<= <> H=host.name.tld [V4NET.2.3.4] P=esmtp S=sss
SMTP>> 250 OK id=10HmaY-0005vi-00
diff --git a/test/stderr/0317 b/test/stderr/0317
index b9cc831fe..92e346180 100644
--- a/test/stderr/0317
+++ b/test/stderr/0317
@@ -25,8 +25,6 @@ Data file written for message 10HmaX-0005vi-00
P Received: from CALLER by mail.test.ex with local (Exim x.yz)
(envelope-from <CALLER@test.ex>)
id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-calling local_scan(); timeout=300
-local_scan() returned 0 NULL
Writing spool header file: TESTSUITE/spool//input//hdr.pppp
Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H
Size of headers = sss
@@ -67,8 +65,6 @@ Data file written for message 10HmaY-0005vi-00
P Received: from CALLER by mail.test.ex with local (Exim x.yz)
(envelope-from <CALLER@test.ex>)
id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-calling local_scan(); timeout=300
-local_scan() returned 0 NULL
Writing spool header file: TESTSUITE/spool//input//hdr.pppp
Renaming spool header file: TESTSUITE/spool//input//10HmaY-0005vi-00-H
Size of headers = sss
diff --git a/test/stderr/0361 b/test/stderr/0361
index 9eac887ac..9b2f26537 100644
--- a/test/stderr/0361
+++ b/test/stderr/0361
@@ -40,8 +40,6 @@ P Received: from CALLER by the.local.host.name with local (Exim x.yz)
(envelope-from <CALLER@test.ex>)
id 10HmaY-0005vi-00
for kilos@recurse.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-calling local_scan(); timeout=300
-local_scan() returned 0 NULL
Writing spool header file: TESTSUITE/spool//input//hdr.pppp
DSN: Write SPOOL :-dsn_envid NULL
DSN: Write SPOOL :-dsn_ret 0
diff --git a/test/stderr/0371 b/test/stderr/0371
index 9ff930690..02344c6c7 100644
--- a/test/stderr/0371
+++ b/test/stderr/0371
@@ -95,8 +95,6 @@ check set acl_m9 = $acl_m9; data
= ; rcpt; data
accept: condition test succeeded in ACL "data"
end of ACL "data": ACCEPT
-calling local_scan(); timeout=300
-local_scan() returned 0 NULL
LOG: MAIN
<= x@y H=(something) [V4NET.0.0.0] P=esmtp S=sss
SMTP>> 250 OK id=10HmaX-0005vi-00
diff --git a/test/stderr/0386 b/test/stderr/0386
index 245137ea2..8b08794a7 100644
--- a/test/stderr/0386
+++ b/test/stderr/0386
@@ -206,8 +206,6 @@ P Received: from [V4NET.11.12.13] (ident=CALLER)
X-Warning: V4NET.11.12.13 is listed at rbl.test.ex
X-Warning: This is a test blacklisting message
>>
-calling local_scan(); timeout=300
-local_scan() returned 0 NULL
Writing spool header file: TESTSUITE/spool//input//hdr.pppp
DSN: Write SPOOL :-dsn_envid NULL
DSN: Write SPOOL :-dsn_ret 0
@@ -389,8 +387,6 @@ P Received: from [V4NET.11.12.13] (ident=CALLER)
X-Warning: V4NET.11.12.13 is listed at rbl.test.ex
X-Warning: This is a test blacklisting message
>>
-calling local_scan(); timeout=300
-local_scan() returned 0 NULL
Writing spool header file: TESTSUITE/spool//input//hdr.pppp
DSN: Write SPOOL :-dsn_envid NULL
DSN: Write SPOOL :-dsn_ret 0
diff --git a/test/stderr/0388 b/test/stderr/0388
index d5e31159a..6e21601ae 100644
--- a/test/stderr/0388
+++ b/test/stderr/0388
@@ -215,8 +215,6 @@ Data file written for message 10HmaY-0005vi-00
P Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
id 10HmaY-0005vi-00
for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-calling local_scan(); timeout=300
-local_scan() returned 0 NULL
Writing spool header file: TESTSUITE/spool//input//hdr.pppp
Renaming spool header file: TESTSUITE/spool//input//10HmaY-0005vi-00-H
Size of headers = sss
diff --git a/test/stderr/0402 b/test/stderr/0402
index 6a66236d7..d308540bb 100644
--- a/test/stderr/0402
+++ b/test/stderr/0402
@@ -133,8 +133,6 @@ Data file written for message 10HmaX-0005vi-00
P Received: from CALLER by mail.test.ex with local (Exim x.yz)
(envelope-from <CALLER@test.ex>)
id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-calling local_scan(); timeout=300
-local_scan() returned 0 NULL
┌considering: ${tod_full}
├──expanding: ${tod_full}
└─────result: Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/stderr/0403 b/test/stderr/0403
index 137405353..70e0b884c 100644
--- a/test/stderr/0403
+++ b/test/stderr/0403
@@ -33,8 +33,6 @@ P Received: from CALLER by mail.test.ex with local (Exim x.yz)
(envelope-from <CALLER@test.ex>)
id 10HmaX-0005vi-00
for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-calling local_scan(); timeout=300
-local_scan() returned 0 NULL
Writing spool header file: TESTSUITE/spool//input//hdr.pppp
DSN: Write SPOOL :-dsn_envid NULL
DSN: Write SPOOL :-dsn_ret 0
diff --git a/test/stderr/0404 b/test/stderr/0404
index 374b1bc75..7febce102 100644
--- a/test/stderr/0404
+++ b/test/stderr/0404
@@ -132,8 +132,6 @@ P Received: from CALLER by mail.test.ex with local (Exim x.yz)
(envelope-from <CALLER@test.ex>)
id 10HmaX-0005vi-00
for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-calling local_scan(); timeout=300
-local_scan() returned 0 NULL
Writing spool header file: TESTSUITE/spool//input//hdr.pppp
DSN: Write SPOOL :-dsn_envid NULL
DSN: Write SPOOL :-dsn_ret 0
@@ -295,8 +293,6 @@ Data file written for message 10HmaY-0005vi-00
>>Generated Received: header line
P Received: from CALLER by mail.test.ex with local (Exim x.yz)
id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
-calling local_scan(); timeout=300
-local_scan() returned 0 NULL
Writing spool header file: TESTSUITE/spool//input//hdr.pppp
DSN: Write SPOOL :-dsn_envid NULL
DSN: Write SPOOL :-dsn_ret 0
diff --git a/test/stderr/0408 b/test/stderr/0408
index 75e9db0d9..c70be3489 100644
--- a/test/stderr/0408
+++ b/test/stderr/0408
@@ -33,8 +33,6 @@ P Received: from CALLER by mail.test.ex with local (Exim x.yz)
(envelope-from <CALLER@test.ex>)
id 10HmaX-0005vi-00
for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-calling local_scan(); timeout=300
-local_scan() returned 0 NULL
Writing spool header file: TESTSUITE/spool//input//hdr.pppp
DSN: Write SPOOL :-dsn_envid NULL
DSN: Write SPOOL :-dsn_ret 0
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-06 07:34:40 +0000