Testsuite: tidying

[exim.git] / test / mail / 0237.CALLER

diff --git a/test/mail/0237.CALLER b/test/mail/0237.CALLER
index 4a1412c365785f88542b3d7040047c220c048837..6b607c26b0b94f3565d1095c86d30f58c0b371d8 100644 (file)
--- a/test/mail/0237.CALLER
+++ b/test/mail/0237.CALLER
@@ -21,9 +21,9 @@ A message that you sent could not be delivered to one or more of its
 recipients. This is a permanent error. The following address(es) failed:
 
   an undisclosed address
-    (generated from |/p/q/r@no.test.ex)
+    (generated from pipe1@no.test.ex)
   an undisclosed address
-    (generated from /a/b/c@no.test.ex)
+    (generated from file1@no.test.ex)
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/delivery-status
@@ -31,11 +31,11 @@ Content-type: message/delivery-status
 Reporting-MTA: dns; the.local.host.name
 
 Action: failed
-Final-Recipient: rfc822;/a/b/c@no.test.ex
+Final-Recipient: rfc822;file1@no.test.ex
 Status: 5.0.0
 
 Action: failed
-Final-Recipient: rfc822;|/p/q/r@no.test.ex
+Final-Recipient: rfc822;pipe1@no.test.ex
 Status: 5.0.0
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
@@ -76,12 +76,12 @@ A message that you sent could not be delivered to one or more of its
 recipients. This is a permanent error. The following address(es) failed:
 
   an undisclosed address
-    (generated from |TESTSUITE/aux-fixed/showenv@yes.test.ex)
+    (generated from pipe2@yes.test.ex)
 
 The following text was generated during the delivery attempt:
 
 ------ an undisclosed address
-       (generated from |TESTSUITE/aux-fixed/showenv@yes.test.ex) ------
+       (generated from pipe2@yes.test.ex) ------
 
 Test pipe script
 Running as: CALLER
@@ -96,18 +96,18 @@ C=
 COLON=
 DOMAIN=yes.test.ex
 HOME=
-LOCAL_PART=|TESTSUITE/aux-fixed/showenv
+LOCAL_PART=pipe2
 LOCAL_PART_PREFIX=
 LOCAL_PART_SUFFIX=
-LOGNAME=|TESTSUITE/aux-fixed/showenv
+LOGNAME=pipe2
 ME=
 MESSAGE_ID=10HmaZ-0005vi-00
 PATH=/bin:/usr/bin
 QUALIFY_DOMAIN=test.ex
-RECIPIENT=|TESTSUITE/aux-fixed/showenv@yes.test.ex
+RECIPIENT=pipe2@yes.test.ex
 SENDER=CALLER@test.ex
 SHELL=/bin/sh
-USER=|TESTSUITE/aux-fixed/showenv
+USER=pipe2
 ----------cat-----------
 >From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
@@ -127,7 +127,7 @@ Content-type: message/delivery-status
 Reporting-MTA: dns; the.local.host.name
 
 Action: failed
-Final-Recipient: rfc822;|TESTSUITE/aux-fixed/showenv@yes.test.ex
+Final-Recipient: rfc822;pipe2@yes.test.ex
 Status: 5.0.0
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM