From ced52486fd4051db23331ab91c988c07f627e076 Mon Sep 17 00:00:00 2001 From: "Heiko Schlittermann (HS12-RIPE)" Date: Thu, 18 Apr 2019 11:33:40 +0200 Subject: [PATCH] testsuite: Update to match the new "hdr.$message_exim_id" tmp file name Bug 2390 --- test/runtest | 3 --- test/stderr/0275 | 2 +- test/stderr/0278 | 2 +- test/stderr/0294 | 4 ++-- test/stderr/0317 | 4 ++-- test/stderr/0361 | 2 +- test/stderr/0386 | 4 ++-- test/stderr/0388 | 4 ++-- test/stderr/0402 | 2 +- test/stderr/0403 | 2 +- test/stderr/0404 | 4 ++-- test/stderr/0408 | 2 +- test/stderr/0465 | 2 +- test/stderr/0471 | 2 +- test/stderr/0487 | 2 +- test/stderr/0489 | 16 ++++++++-------- test/stderr/5004 | 2 +- test/stderr/5005 | 12 ++++++------ test/stderr/5006 | 2 +- test/stdout/0574 | 2 +- 20 files changed, 36 insertions(+), 39 deletions(-) diff --git a/test/runtest b/test/runtest index 1e8e9814c..3b572c155 100755 --- a/test/runtest +++ b/test/runtest @@ -733,9 +733,6 @@ RESET_AFTER_EXTRA_LINE_READ: s/waiting for children of \d+/waiting for children of pppp/; s/waiting for (\S+) \(\d+\)/waiting for $1 (pppp)/; - # The spool header file name varies with PID - s%^(Writing spool header file: .*/hdr).[0-9]{1,5}%$1.pppp%; - # ======== Port numbers ======== # Incoming port numbers may vary, but not in daemon startup line. diff --git a/test/stderr/0275 b/test/stderr/0275 index c19bcc648..3b1af1298 100644 --- a/test/stderr/0275 +++ b/test/stderr/0275 @@ -132,7 +132,7 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Writing spool header file: TESTSUITE/spool//input//hdr.pppp +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00 DSN: Write SPOOL :-dsn_envid NULL DSN: Write SPOOL :-dsn_ret 0 DSN: Flags :0 diff --git a/test/stderr/0278 b/test/stderr/0278 index ab72a1aba..c47b4c731 100644 --- a/test/stderr/0278 +++ b/test/stderr/0278 @@ -91,7 +91,7 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Writing spool header file: TESTSUITE/spool//input//hdr.pppp +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00 DSN: Write SPOOL :-dsn_envid NULL DSN: Write SPOOL :-dsn_ret 0 DSN: Flags :0 diff --git a/test/stderr/0294 b/test/stderr/0294 index a1525db2d..55f747487 100644 --- a/test/stderr/0294 +++ b/test/stderr/0294 @@ -46,7 +46,7 @@ Data file written for message 10HmaX-0005vi-00 P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Writing spool header file: TESTSUITE/spool//input//hdr.pppp +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00 Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H Size of headers = sss LOG: MAIN @@ -78,7 +78,7 @@ P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for two@z; Tue, 2 Mar 1999 09:44:33 +0000 -Writing spool header file: TESTSUITE/spool//input//hdr.pppp +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-0005vi-00 Renaming spool header file: TESTSUITE/spool//input//10HmaY-0005vi-00-H Size of headers = sss LOG: MAIN diff --git a/test/stderr/0317 b/test/stderr/0317 index 92e346180..f509475be 100644 --- a/test/stderr/0317 +++ b/test/stderr/0317 @@ -25,7 +25,7 @@ Data file written for message 10HmaX-0005vi-00 P Received: from CALLER by mail.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Writing spool header file: TESTSUITE/spool//input//hdr.pppp +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00 Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H Size of headers = sss LOG: MAIN @@ -65,7 +65,7 @@ Data file written for message 10HmaY-0005vi-00 P Received: from CALLER by mail.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -Writing spool header file: TESTSUITE/spool//input//hdr.pppp +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-0005vi-00 Renaming spool header file: TESTSUITE/spool//input//10HmaY-0005vi-00-H Size of headers = sss LOG: MAIN diff --git a/test/stderr/0361 b/test/stderr/0361 index e95185570..e2e959fe4 100644 --- a/test/stderr/0361 +++ b/test/stderr/0361 @@ -40,7 +40,7 @@ P Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for kilos@recurse.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Writing spool header file: TESTSUITE/spool//input//hdr.pppp +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-0005vi-00 DSN: Write SPOOL :-dsn_envid NULL DSN: Write SPOOL :-dsn_ret 0 DSN: Flags :0 diff --git a/test/stderr/0386 b/test/stderr/0386 index cf6fc1df9..89f74da33 100644 --- a/test/stderr/0386 +++ b/test/stderr/0386 @@ -206,7 +206,7 @@ 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 >> -Writing spool header file: TESTSUITE/spool//input//hdr.pppp +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00 DSN: Write SPOOL :-dsn_envid NULL DSN: Write SPOOL :-dsn_ret 0 DSN: Flags :0 @@ -387,7 +387,7 @@ 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 >> -Writing spool header file: TESTSUITE/spool//input//hdr.pppp +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-0005vi-00 DSN: Write SPOOL :-dsn_envid NULL DSN: Write SPOOL :-dsn_ret 0 DSN: Flags :0 diff --git a/test/stderr/0388 b/test/stderr/0388 index de7f6e3c9..8b4bf2923 100644 --- a/test/stderr/0388 +++ b/test/stderr/0388 @@ -215,7 +215,7 @@ 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 -Writing spool header file: TESTSUITE/spool//input//hdr.pppp +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-0005vi-00 Renaming spool header file: TESTSUITE/spool//input//10HmaY-0005vi-00-H Size of headers = sss LOG: MAIN @@ -287,7 +287,7 @@ search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> -Writing spool header file: TESTSUITE/spool//input//hdr.pppp +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00 Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H Size of headers = sss LOG: MAIN diff --git a/test/stderr/0402 b/test/stderr/0402 index 9f7ad2841..deda2d9d3 100644 --- a/test/stderr/0402 +++ b/test/stderr/0402 @@ -156,7 +156,7 @@ P Received: from CALLER by mail.test.ex with local (Exim x.yz) ┌considering: ${tod_full} ├──expanding: ${tod_full} └─────result: Tue, 2 Mar 1999 09:44:33 +0000 -Writing spool header file: TESTSUITE/spool//input//hdr.pppp +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00 DSN: Write SPOOL :-dsn_envid NULL DSN: Write SPOOL :-dsn_ret 0 DSN: Flags :0 diff --git a/test/stderr/0403 b/test/stderr/0403 index dbdf77957..f489c1308 100644 --- a/test/stderr/0403 +++ b/test/stderr/0403 @@ -33,7 +33,7 @@ P Received: from CALLER by mail.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Writing spool header file: TESTSUITE/spool//input//hdr.pppp +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00 DSN: Write SPOOL :-dsn_envid NULL DSN: Write SPOOL :-dsn_ret 0 DSN: Flags :0 diff --git a/test/stderr/0404 b/test/stderr/0404 index 3fa39a137..ef185f639 100644 --- a/test/stderr/0404 +++ b/test/stderr/0404 @@ -132,7 +132,7 @@ P Received: from CALLER by mail.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Writing spool header file: TESTSUITE/spool//input//hdr.pppp +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00 DSN: Write SPOOL :-dsn_envid NULL DSN: Write SPOOL :-dsn_ret 0 DSN: Flags :0 @@ -293,7 +293,7 @@ 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 -Writing spool header file: TESTSUITE/spool//input//hdr.pppp +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-0005vi-00 DSN: Write SPOOL :-dsn_envid NULL DSN: Write SPOOL :-dsn_ret 0 DSN: Flags :0 diff --git a/test/stderr/0408 b/test/stderr/0408 index a2c15bbf6..c0995c430 100644 --- a/test/stderr/0408 +++ b/test/stderr/0408 @@ -33,7 +33,7 @@ P Received: from CALLER by mail.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Writing spool header file: TESTSUITE/spool//input//hdr.pppp +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00 DSN: Write SPOOL :-dsn_envid NULL DSN: Write SPOOL :-dsn_ret 0 DSN: Flags :0 diff --git a/test/stderr/0465 b/test/stderr/0465 index e30834929..14864731e 100644 --- a/test/stderr/0465 +++ b/test/stderr/0465 @@ -84,7 +84,7 @@ processing "accept" (TESTSUITE/test-config 20) check verify = header_syntax accept: condition test succeeded in ACL "check_data" end of ACL "check_data": ACCEPT -Writing spool header file: TESTSUITE/spool//input//hdr.pppp +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-0005vi-00 DSN: Write SPOOL :-dsn_envid NULL DSN: Write SPOOL :-dsn_ret 0 DSN: Flags :0 diff --git a/test/stderr/0471 b/test/stderr/0471 index 3a5aa1c7b..2135ee974 100644 --- a/test/stderr/0471 +++ b/test/stderr/0471 @@ -25375,7 +25375,7 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for r1@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Writing spool header file: TESTSUITE/spool//input//hdr.pppp +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00 DSN: Write SPOOL :-dsn_envid NULL DSN: Write SPOOL :-dsn_ret 0 DSN: Flags :0 diff --git a/test/stderr/0487 b/test/stderr/0487 index 16818c990..c2be1d184 100644 --- a/test/stderr/0487 +++ b/test/stderr/0487 @@ -59,7 +59,7 @@ P Received: from CALLER (helo=x.y) (envelope-from ) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Writing spool header file: TESTSUITE/spool//input//hdr.pppp +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00 DSN: Write SPOOL :-dsn_envid NULL DSN: Write SPOOL :-dsn_ret 0 DSN: Flags :0 diff --git a/test/stderr/0489 b/test/stderr/0489 index 2834338ff..61313be32 100644 --- a/test/stderr/0489 +++ b/test/stderr/0489 @@ -23,7 +23,7 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for X@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Writing spool header file: TESTSUITE/spool//input//hdr.pppp +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00 Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H Size of headers = sss LOG: MAIN @@ -55,7 +55,7 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for X@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Writing spool header file: TESTSUITE/spool//input//hdr.pppp +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-0005vi-00 Renaming spool header file: TESTSUITE/spool//input//10HmaY-0005vi-00-H Size of headers = sss LOG: MAIN @@ -86,7 +86,7 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 for X@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Writing spool header file: TESTSUITE/spool//input//hdr.pppp +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaZ-0005vi-00 Renaming spool header file: TESTSUITE/spool//input//10HmaZ-0005vi-00-H Size of headers = sss LOG: MAIN @@ -117,7 +117,7 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbA-0005vi-00 for X@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Writing spool header file: TESTSUITE/spool//input//hdr.pppp +Writing spool header file: TESTSUITE/spool//input//hdr.10HmbA-0005vi-00 Renaming spool header file: TESTSUITE/spool//input//10HmbA-0005vi-00-H Size of headers = sss LOG: MAIN @@ -148,7 +148,7 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbB-0005vi-00 for X@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Writing spool header file: TESTSUITE/spool//input//hdr.pppp +Writing spool header file: TESTSUITE/spool//input//hdr.10HmbB-0005vi-00 Renaming spool header file: TESTSUITE/spool//input//10HmbB-0005vi-00-H Size of headers = sss LOG: MAIN @@ -179,7 +179,7 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbC-0005vi-00 for X@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Writing spool header file: TESTSUITE/spool//input//hdr.pppp +Writing spool header file: TESTSUITE/spool//input//hdr.10HmbC-0005vi-00 Renaming spool header file: TESTSUITE/spool//input//10HmbC-0005vi-00-H Size of headers = sss LOG: MAIN @@ -210,7 +210,7 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbD-0005vi-00 for X@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Writing spool header file: TESTSUITE/spool//input//hdr.pppp +Writing spool header file: TESTSUITE/spool//input//hdr.10HmbD-0005vi-00 Renaming spool header file: TESTSUITE/spool//input//10HmbD-0005vi-00-H Size of headers = sss LOG: MAIN @@ -241,7 +241,7 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbE-0005vi-00 for X@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Writing spool header file: TESTSUITE/spool//input//hdr.pppp +Writing spool header file: TESTSUITE/spool//input//hdr.10HmbE-0005vi-00 Renaming spool header file: TESTSUITE/spool//input//10HmbE-0005vi-00-H Size of headers = sss LOG: MAIN diff --git a/test/stderr/5004 b/test/stderr/5004 index 2fb3e9fc8..cdaddae72 100644 --- a/test/stderr/5004 +++ b/test/stderr/5004 @@ -35,7 +35,7 @@ P Received: from CALLER by mail.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Writing spool header file: TESTSUITE/spool//input//hdr.pppp +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00 DSN: Write SPOOL :-dsn_envid NULL DSN: Write SPOOL :-dsn_ret 0 DSN: Flags :0 diff --git a/test/stderr/5005 b/test/stderr/5005 index 97e7e7a78..791e5eb0c 100644 --- a/test/stderr/5005 +++ b/test/stderr/5005 @@ -33,7 +33,7 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for nofile@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Writing spool header file: TESTSUITE/spool//input//hdr.pppp +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00 DSN: Write SPOOL :-dsn_envid NULL DSN: Write SPOOL :-dsn_ret 0 DSN: Flags :0 @@ -221,7 +221,7 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Writing spool header file: TESTSUITE/spool//input//hdr.pppp +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-0005vi-00 DSN: Write SPOOL :-dsn_envid NULL DSN: Write SPOOL :-dsn_ret 0 DSN: Flags :0 @@ -409,7 +409,7 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Writing spool header file: TESTSUITE/spool//input//hdr.pppp +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaZ-0005vi-00 DSN: Write SPOOL :-dsn_envid NULL DSN: Write SPOOL :-dsn_ret 0 DSN: Flags :0 @@ -558,7 +558,7 @@ Writing retry data for T:userx@test.ex closed hints database and lockfile end of retry processing delivery deferred: update_spool=1 header_rewritten=0 -Writing spool header file: TESTSUITE/spool//input//hdr.pppp +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaZ-0005vi-00 DSN: Write SPOOL :-dsn_envid NULL DSN: Write SPOOL :-dsn_ret 0 DSN: Flags :0 @@ -606,7 +606,7 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmbA-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Writing spool header file: TESTSUITE/spool//input//hdr.pppp +Writing spool header file: TESTSUITE/spool//input//hdr.10HmbA-0005vi-00 DSN: Write SPOOL :-dsn_envid NULL DSN: Write SPOOL :-dsn_ret 0 DSN: Flags :0 @@ -750,7 +750,7 @@ Writing retry data for T:userx@test.ex closed hints database and lockfile end of retry processing delivery deferred: update_spool=1 header_rewritten=0 -Writing spool header file: TESTSUITE/spool//input//hdr.pppp +Writing spool header file: TESTSUITE/spool//input//hdr.10HmbA-0005vi-00 DSN: Write SPOOL :-dsn_envid NULL DSN: Write SPOOL :-dsn_ret 0 DSN: Flags :0 diff --git a/test/stderr/5006 b/test/stderr/5006 index c0e8e68a3..9aecad9b5 100644 --- a/test/stderr/5006 +++ b/test/stderr/5006 @@ -33,7 +33,7 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Writing spool header file: TESTSUITE/spool//input//hdr.pppp +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00 DSN: Write SPOOL :-dsn_envid NULL DSN: Write SPOOL :-dsn_ret 0 DSN: Flags :0 diff --git a/test/stdout/0574 b/test/stdout/0574 index 36d612eae..21794bff6 100644 --- a/test/stdout/0574 +++ b/test/stdout/0574 @@ -36,7 +36,7 @@ end of ACL "chk_data": ACCEPT ┌considering: ${tod_full} ├──expanding: ${tod_full} └─────result: Tue, 2 Mar 1999 09:44:33 +0000 -Writing spool header file: TESTSUITE/spool//input//hdr.pppp +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00 DSN: Write SPOOL :-dsn_envid NULL DSN: Write SPOOL :-dsn_ret 0 DSN: Flags :0 -- 2.25.1