Fix tests 5400, 5401, 5410, 5420 to work under any user.

diff --git a/test/log/5410 b/test/log/5410
index 73eb2a1afa99887d20a3f2c00c04f8abe935d9ee..efcee1b4f5638a64426881fa9d9773faefd56717 100644 (file)
--- 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 ccf5e7429a136de73d9a54b293e977270c2a7cd7..56d6fec7731323ded60616b8c58b49c68ef622bd 100644 (file)
--- 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:<eximtest@myhost.test.ex>
+MAIL FROM:<CALLER@myhost.test.ex>
 RCPT TO:<userx@domain.com>
 DATA
 
@@ -47,7 +47,7 @@ QUIT
 ****
 exim -d-all+acl+transport -bs
 EHLO myhost.test.ex
-MAIL FROM:<eximtest@myhost.test.ex>
+MAIL FROM:<CALLER@myhost.test.ex>
 RCPT TO:<userz@domain.com>
 DATA
 
@@ -83,7 +83,7 @@ QUIT
 ****
 exim -d-all+acl+transport -bs
 EHLO myhost.test.ex
-MAIL FROM:<eximtest@myhost.test.ex>
+MAIL FROM:<CALLER@myhost.test.ex>
 RCPT TO:<usery@domain.com>
 RCPT TO:<userx@domain.com>
 DATA

diff --git a/test/scripts/5400-cutthrough/5401 b/test/scripts/5400-cutthrough/5401
index 42a90f4cb105cf8622f0039ffa9e953e1cf5659c..d92110ce5f771fc3eae5ed05ddd8b39f34bcac5f 100644 (file)
--- 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:<eximtest@myhost.test.ex>
+MAIL FROM:<CALLER@myhost.test.ex>
 RCPT TO:<userx@domain.com>
 DATA
 

diff --git a/test/scripts/5410-cutthrough-OpenSSL/5410 b/test/scripts/5410-cutthrough-OpenSSL/5410
index 9938e00e5dce5a8b5c4acab93fb45f8b39a94c01..9f5ff7196aeb7c61bade5c1839dc7c5b75053835 100644 (file)
--- 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:<eximtest@myhost.test.ex>
+MAIL FROM:<CALLER@myhost.test.ex>
 RCPT TO:<userx@domain.com>
 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:<eximtest@myhost.test.ex>
+MAIL FROM:<CALLER@myhost.test.ex>
 RCPT TO:<usery@domain.com>
 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:<eximtest@myhost.test.ex>
+MAIL FROM:<CALLER@myhost.test.ex>
 RCPT TO:<usery@domain.com>
 DATA
 

diff --git a/test/scripts/5420-cutthrough-GnuTLS/5420 b/test/scripts/5420-cutthrough-GnuTLS/5420
index c43e1865be0fc58d1b9906f5257429252c81edce..446bcc667f066e4d585816cb23ef8456a8e21d69 100644 (file)
--- 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:<eximtest@myhost.test.ex>
+MAIL FROM:<CALLER@myhost.test.ex>
 RCPT TO:<userx@domain.com>
 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:<eximtest@myhost.test.ex>
+MAIL FROM:<CALLER@myhost.test.ex>
 RCPT TO:<usery@domain.com>
 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:<eximtest@myhost.test.ex>
+MAIL FROM:<CALLER@myhost.test.ex>
 RCPT TO:<usery@domain.com>
 DATA
 

diff --git a/test/stderr/5400 b/test/stderr/5400
index 78b56539acac6293d9c2afa18794a5f9fa7a1dbb..bc3dba5ddb738dc21f95e852c4424dcdefd587ed 100644 (file)
--- 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:<eximtest@myhost.test.ex>
+  SMTP>> MAIL FROM:<CALLER@myhost.test.ex>
   SMTP<< 250 Sender OK
   SMTP>> RCPT TO:<userx@domain.com>
   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:<eximtest@myhost.test.ex>
+  SMTP>> MAIL FROM:<CALLER@myhost.test.ex>
   SMTP<< 250 Sender OK
   SMTP>> RCPT TO:<userz@domain.com>
   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:<eximtest@myhost.test.ex>
+  SMTP>> MAIL FROM:<CALLER@myhost.test.ex>
   SMTP<< 250 Sender OK
   SMTP>> RCPT TO:<usery@domain.com>
   SMTP<< 250 Recipient OK

diff --git a/test/stderr/5401 b/test/stderr/5401
index 54f8f1989ea32aa6b48b376baa1a242c55d7619e..135c11ace3d2e79657302619d5912d655e5aa966 100644 (file)
--- 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:<eximtest@myhost.test.ex>
+  SMTP>> MAIL FROM:<CALLER@myhost.test.ex>
   SMTP<< 250 Sender OK
   SMTP>> RCPT TO:<userx@domain.com>
   SMTP<< 250 Recipient OK

diff --git a/test/stderr/5410 b/test/stderr/5410
index 98ba3cb8fa30d37ea29aa3ee1674cfcc1abbff07..f8b31a750745eb5a3c23cc4f60afb9d7b65cfa15 100644 (file)
--- 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:<eximtest@myhost.test.ex>
+  SMTP>> MAIL FROM:<CALLER@myhost.test.ex>
   SMTP<< 250 OK
   SMTP>> RCPT TO:<userx@domain.com>
   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:<eximtest@myhost.test.ex>
+  SMTP>> MAIL FROM:<CALLER@myhost.test.ex>
   SMTP<< 250 OK
   SMTP>> RCPT TO:<usery@domain.com>
   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:<eximtest@myhost.test.ex>
+  SMTP>> MAIL FROM:<CALLER@myhost.test.ex>
   SMTP<< 250 OK
   SMTP>> RCPT TO:<usery@domain.com>
   SMTP<< 250 Accepted

diff --git a/test/stdout/5400 b/test/stdout/5400
index f06824a703be24c8f976ada0b235e494680b750e..74c2d235880815c38e94028bea36595666a30e22 100644 (file)
--- 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:<eximtest@myhost.test.ex>
+MAIL FROM:<CALLER@myhost.test.ex>
 250 Sender OK
 RCPT TO:<userx@domain.com>
 250 Recipient OK
@@ -66,7 +66,7 @@ EHLO myhost.test.ex
 550 Not here, mate
 HELO myhost.test.ex
 250 OK
-MAIL FROM:<eximtest@myhost.test.ex>
+MAIL FROM:<CALLER@myhost.test.ex>
 250 Sender OK
 RCPT TO:<userz@domain.com>
 250 Recipient OK
@@ -91,7 +91,7 @@ Connection request from [ip4.ip4.ip4.ip4]
 220 ESMTP
 EHLO myhost.test.ex
 250 OK
-MAIL FROM:<eximtest@myhost.test.ex>
+MAIL FROM:<CALLER@myhost.test.ex>
 250 Sender OK
 RCPT TO:<usery@domain.com>
 250 Recipient OK

diff --git a/test/stdout/5401 b/test/stdout/5401
index e302e48c026d3380b060908da0e162d69189cbe8..1ceb0bffb466f1187b0184402a36750f7e3cd7d4 100644 (file)
--- 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:<eximtest@myhost.test.ex>
+MAIL FROM:<CALLER@myhost.test.ex>
 250 Sender OK
 RCPT TO:<userx@domain.com>
 250 Recipient OK