From 53618a4022d2e80ac72ee0b37b8a23eb2626e319 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Sun, 13 Oct 2019 20:41:39 +0100 Subject: [PATCH] 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 0a98c2712..5e4413a3e 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@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 R=local T=appendfile +1999-03-02 09:44:33 10HmaZ-0005vi-00 => 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@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 b0a1372da..8daaeed5f 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@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 -To: SRS0=12a1=yg=the.local.host.name=CALLER@test.ex +To: SRS0=ZZZZ=YY=the.local.host.name=CALLER@test.ex References: 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: +Return-path: Received: from localhost ([127.0.0.1] helo=the.local.host.name) by the.local.host.name with esmtp (Exim x.yz) - (envelope-from ) + (envelope-from ) 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 6319f5b81..49ff84535 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. -- 2.30.2