Testsuite: TLS server testcase consolidation

[users/heiko/exim.git] / test / stderr / 0183

diff --git a/test/stderr/0183 b/test/stderr/0183
index a6a0ad5e7e7f4ca3da9539fc13efb1b166c054c9..3ffdf28eae2242e90bd0c359b20416e1daf45b67 100644 (file)
--- a/test/stderr/0183
+++ b/test/stderr/0183
@@ -62,7 +62,7 @@ calling lookuphost router
 lookuphost router called for abcd@test.again.dns
   domain = test.again.dns
 test.again.dns in "*"? yes (matched "*")
 lookuphost router called for abcd@test.again.dns
   domain = test.again.dns
 test.again.dns in "*"? yes (matched "*")

-DNS lookup of test.again.dns-MX: using cached value DNS_AGAIN
+DNS lookup of test.again.dns (MX): using cached value DNS_AGAIN

 lookuphost router: defer for abcd@test.again.dns
   message: host lookup did not complete
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 lookuphost router: defer for abcd@test.again.dns
   message: host lookup did not complete
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>


@@ -103,7 +103,7 @@ set transport smtp
 queued for smtp transport: local_part = abcd
 domain = ten-1.test.ex
   errors_to=NULL
 queued for smtp transport: local_part = abcd
 domain = ten-1.test.ex
   errors_to=NULL

-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=NULL

 routed by lookuphost router
   envelope to: abcd@ten-1.test.ex
   transport: smtp
 routed by lookuphost router
   envelope to: abcd@ten-1.test.ex
   transport: smtp


@@ -166,7 +166,7 @@ expanded list of hosts = 'test.again.dns' options = 'bydns'
 finding IP address for test.again.dns
 doing DNS lookup
 test.again.dns in "*"? yes (matched "*")
 finding IP address for test.again.dns
 doing DNS lookup
 test.again.dns in "*"? yes (matched "*")

-DNS lookup of test.again.dns-A: using cached value DNS_AGAIN
+DNS lookup of test.again.dns (A): using cached value DNS_AGAIN

 useryz router: defer for userz@test.again.dns
   message: host lookup for test.again.dns did not complete (DNS timeout?)
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 useryz router: defer for userz@test.again.dns
   message: host lookup for test.again.dns did not complete (DNS timeout?)
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>


@@ -193,7 +193,7 @@ calling lookuphost router
 lookuphost router called for xyz@ten-1.test.ex
   domain = ten-1.test.ex
 ten-1.test.ex in "*"? yes (matched "*")
 lookuphost router called for xyz@ten-1.test.ex
   domain = ten-1.test.ex
 ten-1.test.ex in "*"? yes (matched "*")

-DNS lookup of ten-1.test.ex-MX: using cached value DNS_NODATA
+DNS lookup of ten-1.test.ex (MX): using cached value DNS_NODATA

 DNS lookup of ten-1.test.ex (A) using fakens
 DNS lookup of ten-1.test.ex (A) succeeded
 fully qualified name = ten-1.test.ex
 DNS lookup of ten-1.test.ex (A) using fakens
 DNS lookup of ten-1.test.ex (A) succeeded
 fully qualified name = ten-1.test.ex


@@ -201,7 +201,7 @@ ten-1.test.ex V4NET.0.0.1 mx=-1 sort=xx
 queued for smtp transport: local_part = xyz
 domain = ten-1.test.ex
   errors_to=NULL
 queued for smtp transport: local_part = xyz
 domain = ten-1.test.ex
   errors_to=NULL

-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=NULL

 routed by lookuphost router
   envelope to: xyz@ten-1.test.ex
   transport: smtp
 routed by lookuphost router
   envelope to: xyz@ten-1.test.ex
   transport: smtp


@@ -271,7 +271,7 @@ calling lookuphost router
 lookuphost router called for abcd@test.fail.dns
   domain = test.fail.dns
 test.fail.dns in "*"? yes (matched "*")
 lookuphost router called for abcd@test.fail.dns
   domain = test.fail.dns
 test.fail.dns in "*"? yes (matched "*")

-DNS lookup of test.fail.dns-MX: using cached value DNS_FAIL
+DNS lookup of test.fail.dns (MX): using cached value DNS_FAIL

 lookuphost router: defer for abcd@test.fail.dns
   message: host lookup did not complete
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 lookuphost router: defer for abcd@test.fail.dns
   message: host lookup did not complete
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>


@@ -312,7 +312,7 @@ set transport smtp
 queued for smtp transport: local_part = abcd
 domain = ten-1.test.ex
   errors_to=NULL
 queued for smtp transport: local_part = abcd
 domain = ten-1.test.ex
   errors_to=NULL

-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=NULL

 routed by lookuphost router
   envelope to: abcd@ten-1.test.ex
   transport: smtp
 routed by lookuphost router
   envelope to: abcd@ten-1.test.ex
   transport: smtp


@@ -374,7 +374,7 @@ expanded list of hosts = 'test.fail.dns' options = 'bydns'
 finding IP address for test.fail.dns
 doing DNS lookup
 test.fail.dns in "*"? yes (matched "*")
 finding IP address for test.fail.dns
 doing DNS lookup
 test.fail.dns in "*"? yes (matched "*")

-DNS lookup of test.fail.dns-A: using cached value DNS_FAIL
+DNS lookup of test.fail.dns (A): using cached value DNS_FAIL

 useryz router: defer for userz@test.fail.dns
   message: host lookup for test.fail.dns did not complete (DNS timeout?)
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 useryz router: defer for userz@test.fail.dns
   message: host lookup for test.fail.dns did not complete (DNS timeout?)
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>


@@ -401,7 +401,7 @@ calling lookuphost router
 lookuphost router called for xyz@ten-1.test.ex
   domain = ten-1.test.ex
 ten-1.test.ex in "*"? yes (matched "*")
 lookuphost router called for xyz@ten-1.test.ex
   domain = ten-1.test.ex
 ten-1.test.ex in "*"? yes (matched "*")

-DNS lookup of ten-1.test.ex-MX: using cached value DNS_NODATA
+DNS lookup of ten-1.test.ex (MX): using cached value DNS_NODATA

 DNS lookup of ten-1.test.ex (A) using fakens
 DNS lookup of ten-1.test.ex (A) succeeded
 fully qualified name = ten-1.test.ex
 DNS lookup of ten-1.test.ex (A) using fakens
 DNS lookup of ten-1.test.ex (A) succeeded
 fully qualified name = ten-1.test.ex


@@ -409,7 +409,7 @@ ten-1.test.ex V4NET.0.0.1 mx=-1 sort=xx
 queued for smtp transport: local_part = xyz
 domain = ten-1.test.ex
   errors_to=NULL
 queued for smtp transport: local_part = xyz
 domain = ten-1.test.ex
   errors_to=NULL

-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=NULL

 routed by lookuphost router
   envelope to: xyz@ten-1.test.ex
   transport: smtp
 routed by lookuphost router
   envelope to: xyz@ten-1.test.ex
   transport: smtp


@@ -481,7 +481,7 @@ calling lookuphost router
 lookuphost router called for abcd@nonexist.test.ex
   domain = nonexist.test.ex
 nonexist.test.ex in "*"? yes (matched "*")
 lookuphost router called for abcd@nonexist.test.ex
   domain = nonexist.test.ex
 nonexist.test.ex in "*"? yes (matched "*")

-DNS lookup of nonexist.test.ex-MX: using cached value DNS_NOMATCH
+DNS lookup of nonexist.test.ex (MX): using cached value DNS_NOMATCH

 lookuphost router declined for abcd@nonexist.test.ex
 "more" is false: skipping remaining routers
 no more routers
 lookuphost router declined for abcd@nonexist.test.ex
 "more" is false: skipping remaining routers
 no more routers


@@ -523,7 +523,7 @@ set transport smtp
 queued for smtp transport: local_part = abcd
 domain = ten-1.test.ex
   errors_to=NULL
 queued for smtp transport: local_part = abcd
 domain = ten-1.test.ex
   errors_to=NULL

-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=NULL

 routed by lookuphost router
   envelope to: abcd@ten-1.test.ex
   transport: smtp
 routed by lookuphost router
   envelope to: abcd@ten-1.test.ex
   transport: smtp


@@ -586,7 +586,7 @@ expanded list of hosts = 'nonexist.test.ex' options = 'bydns'
 finding IP address for nonexist.test.ex
 doing DNS lookup
 nonexist.test.ex in "*"? yes (matched "*")
 finding IP address for nonexist.test.ex
 doing DNS lookup
 nonexist.test.ex in "*"? yes (matched "*")

-DNS lookup of nonexist.test.ex-A: using cached value DNS_NOMATCH
+DNS lookup of nonexist.test.ex (A): using cached value DNS_NOMATCH

 useryz router: defer for userz@nonexist.test.ex
   message: lookup of host "nonexist.test.ex" failed in useryz router
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 useryz router: defer for userz@nonexist.test.ex
   message: lookup of host "nonexist.test.ex" failed in useryz router
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>


@@ -613,7 +613,7 @@ calling lookuphost router
 lookuphost router called for xyz@ten-1.test.ex
   domain = ten-1.test.ex
 ten-1.test.ex in "*"? yes (matched "*")
 lookuphost router called for xyz@ten-1.test.ex
   domain = ten-1.test.ex
 ten-1.test.ex in "*"? yes (matched "*")

-DNS lookup of ten-1.test.ex-MX: using cached value DNS_NODATA
+DNS lookup of ten-1.test.ex (MX): using cached value DNS_NODATA

 DNS lookup of ten-1.test.ex (A) using fakens
 DNS lookup of ten-1.test.ex (A) succeeded
 fully qualified name = ten-1.test.ex
 DNS lookup of ten-1.test.ex (A) using fakens
 DNS lookup of ten-1.test.ex (A) succeeded
 fully qualified name = ten-1.test.ex


@@ -621,7 +621,7 @@ ten-1.test.ex V4NET.0.0.1 mx=-1 sort=xx
 queued for smtp transport: local_part = xyz
 domain = ten-1.test.ex
   errors_to=NULL
 queued for smtp transport: local_part = xyz
 domain = ten-1.test.ex
   errors_to=NULL

-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=NULL

 routed by lookuphost router
   envelope to: xyz@ten-1.test.ex
   transport: smtp
 routed by lookuphost router
   envelope to: xyz@ten-1.test.ex
   transport: smtp


@@ -769,7 +769,7 @@ calling delay router
 delay router called for userd@nonexist.example.com
   domain = nonexist.example.com
 nonexist.example.com in "*"? yes (matched "*")
 delay router called for userd@nonexist.example.com
   domain = nonexist.example.com
 nonexist.example.com in "*"? yes (matched "*")

-DNS lookup of nonexist.example.com-MX: cached value DNS_NOMATCH past valid time
+DNS lookup of nonexist.example.com (MX): cached value DNS_NOMATCH past valid time

 DNS lookup of nonexist.example.com (MX) using fakens
 DNS lookup of nonexist.example.com (MX) gave HOST_NOT_FOUND
 returning DNS_NOMATCH
 DNS lookup of nonexist.example.com (MX) using fakens
 DNS lookup of nonexist.example.com (MX) gave HOST_NOT_FOUND
 returning DNS_NOMATCH