Sync 4.next from master

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

diff --git a/test/stdout/0430 b/test/stdout/0430
index d41c395730b5685a2dd4bacc6bdad95611a83f36..7914594b4eda8a5b79dc7cc47162312759f46506 100644 (file)
--- a/test/stdout/0430
+++ b/test/stdout/0430
@@ -1,19 +1,19 @@
 x@manual.route
   router = r1, transport = t1
-  host ten-1.test.ex [V4NET.0.0.1] 
+  host ten-1.test.ex [V4NET.0.0.1]
   host ten-2.test.ex [V4NET.0.0.2] MX=5
   host ten-3.test.ex [V4NET.0.0.3] MX=6
 x@manual.route
   router = r1, transport = t1
-  host ten-1.test.ex [V4NET.0.0.1] 
+  host ten-1.test.ex [V4NET.0.0.1]
   host ten-2.test.ex [V4NET.0.0.2] MX=5
   host ten-3.test.ex [V4NET.0.0.3] MX=6
-  host ten-6.test.ex [V4NET.0.0.6] 
+  host ten-6.test.ex [V4NET.0.0.6]
 x@manual.route
   router = r1, transport = t1
   host ten-2.test.ex [V4NET.0.0.2] MX=5
   host ten-3.test.ex [V4NET.0.0.3] MX=6
-  host ten-6.test.ex [V4NET.0.0.6] 
+  host ten-6.test.ex [V4NET.0.0.6]
 x@random.manual.route
   router = r2, transport = t1
   host ten-2.test.ex [V4NET.0.0.2] MX=5
@@ -22,39 +22,40 @@ x@random.manual.route
   router = r2, transport = t1
   host ten-2.test.ex [V4NET.0.0.2] MX=5
   host ten-3.test.ex [V4NET.0.0.3] MX=6
-  host ten-1.test.ex [V4NET.0.0.1] 
+  host ten-1.test.ex [V4NET.0.0.1]
 x@random.manual.route
   router = r2, transport = t1
-  host ten-6.test.ex [V4NET.0.0.6] 
+  host ten-6.test.ex [V4NET.0.0.6]
   host ten-2.test.ex [V4NET.0.0.2] MX=5
   host ten-3.test.ex [V4NET.0.0.3] MX=6
-  host ten-1.test.ex [V4NET.0.0.1] 
+  host ten-1.test.ex [V4NET.0.0.1]
 y@random.manual.route
   router = r2, transport = t1
   host ten-2.test.ex [V4NET.0.0.2] MX=5
   host ten-3.test.ex [V4NET.0.0.3] MX=6
-  host ten-6.test.ex [V4NET.0.0.6] 
-  host ten-1.test.ex [V4NET.0.0.1] 
+  host ten-6.test.ex [V4NET.0.0.6]
+  host ten-1.test.ex [V4NET.0.0.1]
 x@random.manual.route
   router = r2, transport = t1
-  host ten-6.test.ex [V4NET.0.0.6] 
+  host ten-6.test.ex [V4NET.0.0.6]
   host ten-2.test.ex [V4NET.0.0.2] MX=5
   host ten-3.test.ex [V4NET.0.0.3] MX=6
 x@manual.route
   router = r1, transport = t1
-  host ten-1.test.ex [V4NET.0.0.1] 
-x@manual.route cannot be resolved at this time:
-  lowest numbered MX record points to local host
+  host ten-1.test.ex [V4NET.0.0.1]
+x@manual.route cannot be resolved at this time: lowest numbered MX record points to local host
 x@manual.route
   router = r1, transport = t1
-  host eximtesthost.test.ex [ip4.ip4.ip4.ip4] MX=5
   host ten-1.test.ex [V4NET.0.0.1] MX=5
-  host ten-6.test.ex [V4NET.0.0.6]      
-x@manual.route is undeliverable:
-  lowest numbered MX record points to local host
-x@random.manual.route cannot be resolved at this time:
-  lookup of host "localhost.test.ex" failed in r2 router
+  host eximtesthost.test.ex [ip4.ip4.ip4.ip4] MX=5
+  host ten-6.test.ex [V4NET.0.0.6] 
+x@manual.route is undeliverable: lowest numbered MX record points to local host
+x@random.manual.route cannot be resolved at this time: lookup of host "localhost.test.ex" failed in r2 router
 x@random.manual.route
   router = r2, transport = t1
-  host ten-6.test.ex [V4NET.0.0.6] 
+  host ten-6.test.ex [V4NET.0.0.6]
   host ten-1.test.ex [V4NET.0.0.1] MX=6
+x@manual.route
+  router = r1, transport = t1
+  host ten-1.test.ex [V4NET.0.0.1] MX=10
+  host ten-2.test.ex [V4NET.0.0.2] MX=20