Fix log line corruption for DKIM status

[exim.git] / test / stdout / 2090

diff --git a/test/stdout/2090 b/test/stdout/2090
index e198f1279c6b2465f01e08b750ffbd904c3f799c..f08abd10b1b6db2ae664056f176f22cc7037cd34 100644 (file)
--- a/test/stdout/2090
+++ b/test/stdout/2090
@@ -1,9 +1,9 @@
 Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220
 Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220

-<<< 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+<<< 220 testhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

 >>> EHLO rhu.barb
 ??? 250-
 >>> EHLO rhu.barb
 ??? 250-

-<<< 250-the.local.host.name Hello rhu.barb [127.0.0.1]
+<<< 250-testhost.test.ex Hello rhu.barb [127.0.0.1]

 ??? 250-SIZE
 <<< 250-SIZE 52428800
 ??? 250-8BITMIME
 ??? 250-SIZE
 <<< 250-SIZE 52428800
 ??? 250-8BITMIME


@@ -23,7 +23,7 @@ Attempting to start TLS
 Succeeded in starting TLS
 >>> EHLO rhu.barb
 ??? 250-
 Succeeded in starting TLS
 >>> EHLO rhu.barb
 ??? 250-

-<<< 250-the.local.host.name Hello rhu.barb [127.0.0.1]
+<<< 250-testhost.test.ex Hello rhu.barb [127.0.0.1]

 ??? 250-SIZE
 <<< 250-SIZE 52428800
 ??? 250-8BITMIME
 ??? 250-SIZE
 <<< 250-SIZE 52428800
 ??? 250-8BITMIME


@@ -37,7 +37,7 @@ Succeeded in starting TLS
 >>> MAIL FROM:<someone@some.domain>
 ??? 250
 <<< 250 OK
 >>> MAIL FROM:<someone@some.domain>
 ??? 250
 <<< 250 OK

->>> RCPT TO:<CALLER@the.local.host.name>
+>>> RCPT TO:<CALLER@test.ex>

 ??? 250
 <<< 250 Accepted
 >>> BDAT 88 LAST
 ??? 250
 <<< 250 Accepted
 >>> BDAT 88 LAST


@@ -51,14 +51,14 @@ Succeeded in starting TLS
 <<< 250 OK id=10HmaX-0005vi-00
 >>> QUIT
 ??? 221
 <<< 250 OK id=10HmaX-0005vi-00
 >>> QUIT
 ??? 221

-<<< 221 the.local.host.name closing connection
+<<< 221 testhost.test.ex closing connection

 End of script
 Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220
 End of script
 Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220

-<<< 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+<<< 220 testhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

 >>> EHLO rhu.barb
 ??? 250-
 >>> EHLO rhu.barb
 ??? 250-

-<<< 250-the.local.host.name Hello rhu.barb [127.0.0.1]
+<<< 250-testhost.test.ex Hello rhu.barb [127.0.0.1]

 ??? 250-SIZE
 <<< 250-SIZE 52428800
 ??? 250-8BITMIME
 ??? 250-SIZE
 <<< 250-SIZE 52428800
 ??? 250-8BITMIME


@@ -78,7 +78,7 @@ Attempting to start TLS
 Succeeded in starting TLS
 >>> EHLO rhu.barb
 ??? 250-
 Succeeded in starting TLS
 >>> EHLO rhu.barb
 ??? 250-

-<<< 250-the.local.host.name Hello rhu.barb [127.0.0.1]
+<<< 250-testhost.test.ex Hello rhu.barb [127.0.0.1]

 ??? 250-SIZE
 <<< 250-SIZE 52428800
 ??? 250-8BITMIME
 ??? 250-SIZE
 <<< 250-SIZE 52428800
 ??? 250-8BITMIME


@@ -89,13 +89,7 @@ Succeeded in starting TLS
 <<< 250-CHUNKING
 ??? 250 HELP
 <<< 250 HELP
 <<< 250-CHUNKING
 ??? 250 HELP
 <<< 250 HELP

->>> MAIL FROM:<someone@some.domain>
->>> RCPT TO:<CALLER@the.local.host.name>
->>> BDAT 88 LAST
->>> To: Susan@random.com
->>> From: Sam@random.com
->>> Subject: This is a bodyless test message
->>> 
+>>> MAIL FROM:<someone@some.domain>\r\nRCPT TO:<CALLER@test.ex>\r\nBDAT 88 LAST\r\nTo: Susan@random.com\r\nFrom: Sam@random.com\r\nSubject: This is a bodyless test message\r\n

 ??? 250
 <<< 250 OK
 ??? 250
 ??? 250
 <<< 250 OK
 ??? 250


@@ -106,5 +100,5 @@ Succeeded in starting TLS
 <<< 250 OK id=10HmaY-0005vi-00
 >>> QUIT
 ??? 221
 <<< 250 OK id=10HmaY-0005vi-00
 >>> QUIT
 ??? 221

-<<< 221 the.local.host.name closing connection
+<<< 221 testhost.test.ex closing connection

 End of script
 End of script