From 14f3b4702d2a65d2139bbae2cf9d7d37603c2048 Mon Sep 17 00:00:00 2001 From: Tony Finch Date: Fri, 7 Dec 2012 15:49:31 +0000 Subject: [PATCH] Fix tests 5401 and 5410 when not run under a user named eximtest. --- test/log/5410 | 6 +++--- test/stderr/5401 | 2 +- test/stderr/5410 | 6 +++--- test/stdout/5401 | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/test/log/5410 b/test/log/5410 index efcee1b4f..73eb2a1af 100644 --- a/test/log/5410 +++ b/test/log/5410 @@ -1,15 +1,15 @@ 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 -1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLSv1:AES256-SHA:256 S=sss id=E10HmaY-0005vi-00@myhost.test.ex +1999-03-02 09:44:33 10HmaX-0005vi-00 <= eximtest@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtps X=TLSv1:AES256-SHA:256 S=sss id=E10HmaY-0005vi-00@myhost.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 >> userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] X=TLSv1:AES256-SHA:256 C="250 OK id=10HmaX-0005vi-00" 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed -1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbA-0005vi-00@myhost.test.ex +1999-03-02 09:44:33 10HmaZ-0005vi-00 <= eximtest@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbA-0005vi-00@myhost.test.ex 1999-03-02 09:44:33 10HmaZ-0005vi-00 no immediate delivery: queued by ACL 1999-03-02 09:44:33 10HmbA-0005vi-00 >> usery@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaZ-0005vi-00" 1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed -1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbC-0005vi-00@myhost.test.ex +1999-03-02 09:44:33 10HmbB-0005vi-00 <= eximtest@myhost.test.ex H=the.local.host.name (myhost.test.ex) [ip4.ip4.ip4.ip4] P=esmtp S=sss id=E10HmbC-0005vi-00@myhost.test.ex 1999-03-02 09:44:33 10HmbB-0005vi-00 no immediate delivery: queued by ACL 1999-03-02 09:44:33 10HmbC-0005vi-00 >> usery@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbB-0005vi-00" 1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss diff --git a/test/stderr/5401 b/test/stderr/5401 index 135c11ace..54f8f1989 100644 --- a/test/stderr/5401 +++ b/test/stderr/5401 @@ -14,7 +14,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 from ip4.ip4.ip4.ip4 ... connected SMTP<< 220 ESMTP SMTP>> EHLO myhost.test.ex SMTP<< 250 OK - SMTP>> MAIL FROM: + SMTP>> MAIL FROM: SMTP<< 250 Sender OK SMTP>> RCPT TO: SMTP<< 250 Recipient OK diff --git a/test/stderr/5410 b/test/stderr/5410 index f8b31a750..98ba3cb8f 100644 --- a/test/stderr/5410 +++ b/test/stderr/5410 @@ -86,7 +86,7 @@ expanding: ${if eq {$address_data}{userz}{*}{:}} 250-8BITMIME 250-PIPELINING 250 HELP - SMTP>> MAIL FROM: + SMTP>> MAIL FROM: SMTP<< 250 OK SMTP>> RCPT TO: SMTP<< 250 Accepted @@ -218,7 +218,7 @@ skipping: result is not used expanding: ${if eq {$address_data}{usery}{*}{:}} result: * 127.0.0.1 in hosts_avoid_tls? yes (matched "*") - SMTP>> MAIL FROM: + SMTP>> MAIL FROM: SMTP<< 250 OK SMTP>> RCPT TO: SMTP<< 250 Accepted @@ -350,7 +350,7 @@ skipping: result is not used expanding: ${if eq {$address_data}{usery}{*}{:}} result: * 127.0.0.1 in hosts_avoid_tls? yes (matched "*") - SMTP>> MAIL FROM: + SMTP>> MAIL FROM: SMTP<< 250 OK SMTP>> RCPT TO: SMTP<< 250 Accepted diff --git a/test/stdout/5401 b/test/stdout/5401 index 1ceb0bffb..e302e48c0 100644 --- a/test/stdout/5401 +++ b/test/stdout/5401 @@ -16,7 +16,7 @@ Connection request from [ip4.ip4.ip4.ip4] 220 ESMTP EHLO myhost.test.ex 250 OK -MAIL FROM: +MAIL FROM: 250 Sender OK RCPT TO: 250 Recipient OK -- 2.30.2