From: Jeremy Harris Date: Sun, 9 Dec 2012 14:27:37 +0000 (+0000) Subject: Fix tests 5400, 5401, 5410, 5420 to work under any user. X-Git-Tag: exim-4_82_RC2~90 X-Git-Url: https://git.exim.org/users/jgh/exim.git/commitdiff_plain/9d6bb16d6af8c4d2c5e2f58d2a6983c03600c35a Fix tests 5400, 5401, 5410, 5420 to work under any user. --- diff --git a/test/log/5410 b/test/log/5410 index 73eb2a1af..efcee1b4f 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 <= 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 <= 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 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 <= 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 <= 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 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 <= 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 <= 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 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/scripts/5400-cutthrough/5400 b/test/scripts/5400-cutthrough/5400 index ccf5e7429..56d6fec77 100644 --- a/test/scripts/5400-cutthrough/5400 +++ b/test/scripts/5400-cutthrough/5400 @@ -18,7 +18,7 @@ QUIT **** exim -d-all+acl+transport -bs EHLO myhost.test.ex -MAIL FROM: +MAIL FROM: RCPT TO: DATA @@ -47,7 +47,7 @@ QUIT **** exim -d-all+acl+transport -bs EHLO myhost.test.ex -MAIL FROM: +MAIL FROM: RCPT TO: DATA @@ -83,7 +83,7 @@ QUIT **** exim -d-all+acl+transport -bs EHLO myhost.test.ex -MAIL FROM: +MAIL FROM: RCPT TO: RCPT TO: DATA diff --git a/test/scripts/5400-cutthrough/5401 b/test/scripts/5400-cutthrough/5401 index 42a90f4cb..d92110ce5 100644 --- a/test/scripts/5400-cutthrough/5401 +++ b/test/scripts/5400-cutthrough/5401 @@ -18,7 +18,7 @@ QUIT **** exim -d-all+acl+transport -bs EHLO myhost.test.ex -MAIL FROM: +MAIL FROM: RCPT TO: DATA diff --git a/test/scripts/5410-cutthrough-OpenSSL/5410 b/test/scripts/5410-cutthrough-OpenSSL/5410 index 9938e00e5..9f5ff7196 100644 --- a/test/scripts/5410-cutthrough-OpenSSL/5410 +++ b/test/scripts/5410-cutthrough-OpenSSL/5410 @@ -4,7 +4,7 @@ exim -DSERVER=server -bd -oX PORT_D # this one should succeed exim -d-all+acl+transport+expand+lists -bs EHLO myhost.test.ex -MAIL FROM: +MAIL FROM: RCPT TO: DATA @@ -15,7 +15,7 @@ QUIT # so this one should not use TLS exim -d-all+acl+transport+expand+lists -bs EHLO myhost.test.ex -MAIL FROM: +MAIL FROM: RCPT TO: DATA @@ -26,7 +26,7 @@ QUIT # so this one should not use TLS exim -d-all+acl+transport+expand+lists -bs EHLO myhost.test.ex -MAIL FROM: +MAIL FROM: RCPT TO: DATA diff --git a/test/scripts/5420-cutthrough-GnuTLS/5420 b/test/scripts/5420-cutthrough-GnuTLS/5420 index c43e1865b..446bcc667 100644 --- a/test/scripts/5420-cutthrough-GnuTLS/5420 +++ b/test/scripts/5420-cutthrough-GnuTLS/5420 @@ -3,7 +3,7 @@ exim -DSERVER=server -bd -oX PORT_D **** exim -d-all+acl+transport+expand+lists -bs EHLO myhost.test.ex -MAIL FROM: +MAIL FROM: RCPT TO: DATA @@ -13,7 +13,7 @@ QUIT # via a transport setting hosts_avoid_tls exim -d-all+acl+transport+expand+lists -bs EHLO myhost.test.ex -MAIL FROM: +MAIL FROM: RCPT TO: DATA @@ -23,7 +23,7 @@ QUIT # via a transport setting hosts_verify_avoid_tls exim -d-all+acl+transport+expand+lists -bs EHLO myhost.test.ex -MAIL FROM: +MAIL FROM: RCPT TO: DATA diff --git a/test/stderr/5400 b/test/stderr/5400 index 78b56539a..bc3dba5dd 100644 --- a/test/stderr/5400 +++ b/test/stderr/5400 @@ -17,7 +17,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 @@ -60,7 +60,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 from ip4.ip4.ip4.ip4 ... connected SMTP<< 550 Not here, mate SMTP>> HELO myhost.test.ex SMTP<< 250 OK - SMTP>> MAIL FROM: + SMTP>> MAIL FROM: SMTP<< 250 Sender OK SMTP>> RCPT TO: SMTP<< 250 Recipient OK @@ -101,7 +101,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/5401 b/test/stderr/5401 index 54f8f1989..135c11ace 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 98ba3cb8f..f8b31a750 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/5400 b/test/stdout/5400 index f06824a70..74c2d2358 100644 --- a/test/stdout/5400 +++ b/test/stdout/5400 @@ -39,7 +39,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 @@ -66,7 +66,7 @@ EHLO myhost.test.ex 550 Not here, mate HELO myhost.test.ex 250 OK -MAIL FROM: +MAIL FROM: 250 Sender OK RCPT TO: 250 Recipient OK @@ -91,7 +91,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 diff --git a/test/stdout/5401 b/test/stdout/5401 index e302e48c0..1ceb0bffb 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