Testsuite: stabilize output sequence for case 0906

diff --git a/test/confs/0906 b/test/confs/0906
index 2e8d35a9112f6aac8b2123b9864e55e4b940b750..2c47966eaa3deeedf7655f515427cf025c5b2d64 100644 (file)
--- a/test/confs/0906
+++ b/test/confs/0906
@@ -18,7 +18,7 @@ spool_wireformat = true
 primary_hostname = testhost.test.ex
 domainlist local_domains = @ : test.ex
 
-acl_smtp_rcpt = accept
+acl_smtp_rcpt = acl_r
 log_selector = +received_recipients
 
 .ifdef _OPT_MAIN_TLS_CERTIFICATE
@@ -28,6 +28,12 @@ tls_privatekey = DIR/aux-fixed/cert1
 
 # ----- ACL -----
 
+begin acl
+acl_r:
+ accept        condition = ${if != {$received_port}{PORT_S}}
+       control = queue_only
+ accept
+
 # ----- Routers -----
 
 begin routers

diff --git a/test/log/0906 b/test/log/0906
index 3034f16fcd233bf9e73805a754cb8d932f684704..12e227677079438230c53daa3794e4937cbf9076 100644 (file)
--- a/test/log/0906
+++ b/test/log/0906
@@ -1,9 +1,12 @@
+1999-03-02 09:44:33 Start queue run: pid=pppp
+1999-03-02 09:44:33 10HmaX-0005vi-00 => a <a@test.ex> R=localuser T=local_delivery
+1999-03-02 09:44:33 10HmaX-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 port 1225 port 1224
-1999-03-02 09:44:33 10HmaX-0005vi-00 <= sender@dom H=(test.com) [127.0.0.1] P=esmtp K S=sss for a@test.ex
-1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> H=localhost (testhost.test.ex) [127.0.0.1] P=esmtp K S=sss for a@test.ex
-1999-03-02 09:44:33 10HmaY-0005vi-00 => a <a@test.ex> R=localuser T=local_delivery
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= sender@dom H=(test.com) [127.0.0.1] P=esmtp K S=sss for a@test.ex
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= <> H=localhost (testhost.test.ex) [127.0.0.1] P=esmtp K S=sss for a@test.ex
+1999-03-02 09:44:33 10HmaX-0005vi-00 no immediate delivery: queued by ACL
+1999-03-02 09:44:33 10HmaY-0005vi-00 => a@test.ex R=to_server T=remote_smtp H=127.0.0.1 [127.0.0.1] K C="250- 8nn byte chunk, total 8nn\\n250 OK id=10HmaX-0005vi-00"
 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
-1999-03-02 09:44:33 10HmaX-0005vi-00 => a@test.ex R=to_server T=remote_smtp H=127.0.0.1 [127.0.0.1] K C="250- 8nn byte chunk, total 8nn\\n250 OK id=10HmaY-0005vi-00"
-1999-03-02 09:44:33 10HmaX-0005vi-00 Completed

diff --git a/test/mail/0906.a b/test/mail/0906.a
index e5a07fc2d293750806bf5328a33d7a935a539501..a55f68d7fe3bff07864226ce57d2a2f03bb0e255 100644 (file)
--- a/test/mail/0906.a
+++ b/test/mail/0906.a
@@ -2,12 +2,12 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Return-path: <>
 Received: from localhost ([127.0.0.1] helo=testhost.test.ex)
        by testhost.test.ex with esmtp (Exim x.yz)
-       id 10HmaY-0005vi-00
+       id 10HmaX-0005vi-00
        for a@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from [127.0.0.1] (helo=test.com)
        by testhost.test.ex with esmtp (Exim x.yz)
        (envelope-from <sender@dom>)
-       id 10HmaX-0005vi-00
+       id 10HmaY-0005vi-00
        for a@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 Subject: foo
 X-body-linecount: 0

diff --git a/test/scripts/0000-Basic/0906 b/test/scripts/0000-Basic/0906
index f80899feeaf8dc1b5356d9d1a681eb5fe2fc2a7c..18ab5bb54f683a9d7d6a421723dadc6a274b0e8f 100644 (file)
--- a/test/scripts/0000-Basic/0906
+++ b/test/scripts/0000-Basic/0906
@@ -119,4 +119,6 @@ QUIT
 #
 sleep 1
 killdaemon
+exim -q
+****
 no_msglog_check

diff --git a/test/stdout/0906 b/test/stdout/0906
index 57be5fe3d7750027b286f18138b0dc7472b6d0cf..0eb13cc3f98ec8ea80427db6cc639baae32cb408 100644 (file)
--- a/test/stdout/0906
+++ b/test/stdout/0906
@@ -118,6 +118,6 @@ Connecting to 127.0.0.1 port 1224 ... connected
 ??? 250-
 <<< 250- 8408 byte chunk, total 8408
 ??? 250
-<<< 250 OK id=10HmaX-0005vi-00
+<<< 250 OK id=10HmaY-0005vi-00
 >>> QUIT
 End of script