Testsuite: spilt testcase

[exim.git] / test / stderr / 0499

diff --git a/test/stderr/0499 b/test/stderr/0499
index c8535fc352ef5d52e6be5dd14c781b2b7c1555f5..8a3733a502151481bf68a36bcd7d8223a2edd18e 100644 (file)
--- a/test/stderr/0499
+++ b/test/stderr/0499
@@ -1,6 +1,6 @@
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
 Exim version x.yz ....
 changed uid/gid: forcing real = effective

-  uid=uuuu gid=CALLER_GID pid=pppp
+  uid=uuuu gid=CALLER_GID pid=p1234

 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid


@@ -16,6 +16,11 @@ routing ph@mxt1.test.ex
 --------> r1 router <--------
 local_part=ph domain=mxt1.test.ex
 checking domains
 --------> r1 router <--------
 local_part=ph domain=mxt1.test.ex
 checking domains

+mxt1.test.ex in "+anymx"?
+ list element: +anymx
+  start sublist anymx
+   mxt1.test.ex in "@mx_any"?
+   ╎list element: @mx_any

 DNS lookup of mxt1.test.ex (MX) using fakens
 DNS lookup of mxt1.test.ex (MX) succeeded
 DNS lookup of eximtesthost.test.ex (A) using fakens
 DNS lookup of mxt1.test.ex (MX) using fakens
 DNS lookup of mxt1.test.ex (MX) succeeded
 DNS lookup of eximtesthost.test.ex (A) using fakens


@@ -23,10 +28,16 @@ DNS lookup of eximtesthost.test.ex (A) succeeded
 local host has lowest MX
 host_find_bydns yield = HOST_FOUND_LOCAL (4); returned hosts:
   eximtesthost.test.ex ip4.ip4.ip4.ip4 MX=5 
 local host has lowest MX
 host_find_bydns yield = HOST_FOUND_LOCAL (4); returned hosts:
   eximtesthost.test.ex ip4.ip4.ip4.ip4 MX=5 

-mxt1.test.ex in "@mx_any"? yes (matched "@mx_any")
-data from lookup saved for cache for +anymx: key 'mxt1.test.ex' value '@mx_any'
-mxt1.test.ex in "+anymx"? yes (matched "+anymx")
+   ╎mxt1.test.ex in "@mx_any"? yes (matched "@mx_any")
+  end sublist anymx
+ data from lookup saved for cache for +anymx: key 'mxt1.test.ex' value '@mx_any'
+ mxt1.test.ex in "+anymx"? yes (matched "+anymx")

 checking "condition" "${if match_domain{$domain}{+anymx}{yes}}"...
 checking "condition" "${if match_domain{$domain}{+anymx}{yes}}"...

+ mxt1.test.ex in "+anymx"?
+  list element: +anymx
+   start sublist anymx
+   ╎mxt1.test.ex in "@mx_any"?
+   ╎ list element: @mx_any

 DNS lookup of mxt1.test.ex (MX) using fakens
 DNS lookup of mxt1.test.ex (MX) succeeded
 DNS lookup of eximtesthost.test.ex (A) using fakens
 DNS lookup of mxt1.test.ex (MX) using fakens
 DNS lookup of mxt1.test.ex (MX) succeeded
 DNS lookup of eximtesthost.test.ex (A) using fakens


@@ -34,8 +45,9 @@ DNS lookup of eximtesthost.test.ex (A) succeeded
 local host has lowest MX
 host_find_bydns yield = HOST_FOUND_LOCAL (4); returned hosts:
   eximtesthost.test.ex ip4.ip4.ip4.ip4 MX=5 
 local host has lowest MX
 host_find_bydns yield = HOST_FOUND_LOCAL (4); returned hosts:
   eximtesthost.test.ex ip4.ip4.ip4.ip4 MX=5 

-mxt1.test.ex in "@mx_any"? yes (matched "@mx_any")
-mxt1.test.ex in "+anymx"? yes (matched "+anymx")
+   ╎ mxt1.test.ex in "@mx_any"? yes (matched "@mx_any")
+   end sublist anymx
+  mxt1.test.ex in "+anymx"? yes (matched "+anymx")

 calling r1 router
 r1 router called for ph@mxt1.test.ex
   domain = mxt1.test.ex
 calling r1 router
 r1 router called for ph@mxt1.test.ex
   domain = mxt1.test.ex


@@ -43,9 +55,9 @@ set transport t1
 queued for t1 transport: local_part = ph
 domain = mxt1.test.ex
   errors_to=NULL
 queued for t1 transport: local_part = ph
 domain = mxt1.test.ex
   errors_to=NULL

-  domain_data=@mx_any localpart_data=NULL
+  domain_data=@mx_any local_part_data=NULL

 routed by r1 router
   envelope to: ph@mxt1.test.ex
   transport: t1
 search_tidyup called
 routed by r1 router
   envelope to: ph@mxt1.test.ex
   transport: t1
 search_tidyup called

->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>