Gitweb:
https://git.exim.org/exim.git/commitdiff/53618a4022d2e80ac72ee0b37b8a23eb2626e319
Commit: 53618a4022d2e80ac72ee0b37b8a23eb2626e319
Parent: fa53280ee478e5bfe652f45cff37fe1ba32a2ad5
Author: Jeremy Harris <jgh146exb@???>
AuthorDate: Sun Oct 13 20:41:39 2019 +0100
Committer: Jeremy Harris <jgh146exb@???>
CommitDate: Sun Oct 13 22:23:24 2019 +0100
Testsuite: munging for SRS testcase
---
test/log/4620 | 6 +++---
test/mail/4620.CALLER | 8 ++++----
test/runtest | 5 +++++
3 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/test/log/4620 b/test/log/4620
index 0a98c27..5e4413a 100644
--- a/test/log/4620
+++ b/test/log/4620
@@ -3,14 +3,14 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
1999-03-02 09:44:33 Start queue run: pid=pppp
1999-03-02 09:44:33 10HmaY-0005vi-00 ** remote_user@??? R=remote_bouncer: account disabled
-1999-03-02 09:44:33 10HmaZ-0005vi-00 <= <> R=10HmaY-0005vi-00 U=EXIMUSER P=local S=sss for SRS0=12a1=yg=the.local.host.name=CALLER@???
+1999-03-02 09:44:33 10HmaZ-0005vi-00 <= <> R=10HmaY-0005vi-00 U=EXIMUSER P=local S=sss for SRS0=ZZZZ=YY=the.local.host.name=CALLER@???
1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
1999-03-02 09:44:33 End queue run: pid=pppp
1999-03-02 09:44:33 Start queue run: pid=pppp
-1999-03-02 09:44:33 10HmaZ-0005vi-00 => CALLER <SRS0=12a1=yg=the.local.host.name=CALLER@???> R=local T=appendfile
+1999-03-02 09:44:33 10HmaZ-0005vi-00 => CALLER <SRS0=ZZZZ=YY=the.local.host.name=CALLER@???> R=local T=appendfile
1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
1999-03-02 09:44:33 End queue run: pid=pppp
******** SERVER ********
1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on [127.0.0.1]:PORT_S
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= SRS0=12a1=yg=the.local.host.name=CALLER@??? H=localhost (the.local.host.name) [127.0.0.1] P=esmtp S=sss id=E10HmaX-0005vi-00@??? for remote_user@???
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= SRS0=ZZZZ=YY=the.local.host.name=CALLER@??? H=localhost (the.local.host.name) [127.0.0.1] P=esmtp S=sss id=E10HmaX-0005vi-00@??? for remote_user@???
diff --git a/test/mail/4620.CALLER b/test/mail/4620.CALLER
index b0a1372..8daaeed 100644
--- a/test/mail/4620.CALLER
+++ b/test/mail/4620.CALLER
@@ -1,11 +1,11 @@
From MAILER-DAEMON Tue Mar 02 09:44:33 1999
Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
id 10HmaZ-0005vi-00
- for SRS0=12a1=yg=the.local.host.name=CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
+ for SRS0=ZZZZ=YY=the.local.host.name=CALLER@???; Tue, 2 Mar 1999 09:44:33 +0000
X-Failed-Recipients: remote_user@???
Auto-Submitted: auto-replied
From: Mail Delivery System <Mailer-Daemon@???>
-To: SRS0=12a1=yg=the.local.host.name=CALLER@???
+To: SRS0=ZZZZ=YY=the.local.host.name=CALLER@???
References: <E10HmaX-0005vi-00@???>
Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
MIME-Version: 1.0
@@ -36,10 +36,10 @@ Status: 5.0.0
--NNNNNNNNNN-eximdsn-MMMMMMMMMM
Content-type: message/rfc822
-Return-path: <SRS0=12a1=yg=the.local.host.name=CALLER@???>
+Return-path: <SRS0=ZZZZ=YY=the.local.host.name=CALLER@???>
Received: from localhost ([127.0.0.1] helo=the.local.host.name)
by the.local.host.name with esmtp (Exim x.yz)
- (envelope-from <SRS0=12a1=yg=the.local.host.name=CALLER@???>)
+ (envelope-from <SRS0=ZZZZ=YY=the.local.host.name=CALLER@???>)
id 10HmaY-0005vi-00
for remote_user@???; Tue, 2 Mar 1999 09:44:33 +0000
Received: from CALLER by the.local.host.name with local (Exim x.yz)
diff --git a/test/runtest b/test/runtest
index 6319f5b..49ff845 100755
--- a/test/runtest
+++ b/test/runtest
@@ -913,6 +913,11 @@ RESET_AFTER_EXTRA_LINE_READ:
last if !defined $_;
+ # SRS timestamps and signatures vary by hostname and from run to run
+
+ s/SRS0=....=..=[^=]+=[^@]+\@test.ex/SRS0=ZZZZ=YY=the.local.host.name=CALLER\@test.ex/;
+
+
# ======== Output from the "fd" program about open descriptors ========
# The statuses seem to be different on different operating systems, but
# at least we'll still be checking the number of open fd's.
