Testsuite: munging for SRS testcase

diff --git a/test/log/4620 b/test/log/4620
index 0a98c271228c075bc2b116b7d065882c0d613ce4..5e4413a3e09a38659aaa5c236c30f957a1b2bd98 100644 (file)
--- 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@remote.ex 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@test.ex
+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@test.ex
 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@test.ex> R=local T=appendfile
+1999-03-02 09:44:33 10HmaZ-0005vi-00 => CALLER <SRS0=ZZZZ=YY=the.local.host.name=CALLER@test.ex> 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@test.ex H=localhost (the.local.host.name) [127.0.0.1] P=esmtp S=sss id=E10HmaX-0005vi-00@the.local.host.name for remote_user@remote.ex
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= SRS0=ZZZZ=YY=the.local.host.name=CALLER@test.ex H=localhost (the.local.host.name) [127.0.0.1] P=esmtp S=sss id=E10HmaX-0005vi-00@the.local.host.name for remote_user@remote.ex

diff --git a/test/mail/4620.CALLER b/test/mail/4620.CALLER
index b0a1372da48462fd3408b7da4d4e800d01e75c91..8daaeed5fd3d287ff33cd42f35354cc2800ba86c 100644 (file)
--- 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@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+       for SRS0=ZZZZ=YY=the.local.host.name=CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: remote_user@remote.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@the.local.host.name>
-To: SRS0=12a1=yg=the.local.host.name=CALLER@test.ex
+To: SRS0=ZZZZ=YY=the.local.host.name=CALLER@test.ex
 References: <E10HmaX-0005vi-00@the.local.host.name>
 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@test.ex>
+Return-path: <SRS0=ZZZZ=YY=the.local.host.name=CALLER@test.ex>
 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@test.ex>)
+       (envelope-from <SRS0=ZZZZ=YY=the.local.host.name=CALLER@test.ex>)
        id 10HmaY-0005vi-00
        for remote_user@remote.ex; 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 6319f5b8163a03da8257e3ac107de3068edde037..49ff84535c30f49cd4a31b78e8f1a087061279db 100755 (executable)
--- 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.