Routing: for efficiency, avoid complexifying the "condition" string until the second...

[users/heiko/exim.git] / test / stdout / 2190

diff --git a/test/stdout/2190 b/test/stdout/2190
index 7942a8ce5451d1f7e526cf7ce5730b5612a5f5a8..c1ee9ffcf6af30ec456c3ef1f4cd2373e11403db 100644 (file)
--- a/test/stdout/2190
+++ b/test/stdout/2190
@@ -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


@@ -37,7 +37,7 @@ SSL connection using AES256-SHA
 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


@@ -51,7 +51,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


@@ -65,14 +65,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


@@ -106,7 +106,7 @@ SSL connection using AES256-SHA
 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


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

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

 >>> BDAT 88 LAST
 >>> To: Susan@random.com
 >>> From: Sam@random.com
 >>> BDAT 88 LAST
 >>> To: Susan@random.com
 >>> From: Sam@random.com


@@ -134,5 +134,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