Testsuite: TLS server testcase consolidation

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

diff --git a/test/stderr/0297 b/test/stderr/0297
index 4706f8780fe6958b71d941478b4e552f19b55c9e..42db67a73d94ec9ebac6e052e1b39974cd57bcc1 100644 (file)
--- a/test/stderr/0297
+++ b/test/stderr/0297
@@ -8,8 +8,8 @@ routing /a/b/c@myhost.test.ex
 --------> r1 router <--------
 local_part=/a/b/c domain=myhost.test.ex
 calling r1 router
 --------> r1 router <--------
 local_part=/a/b/c domain=myhost.test.ex
 calling r1 router

-rda_interpret (string): $local_part
-expanded: /a/b/c
+rda_interpret (string): '${bless:$local_part}'
+expanded: '/a/b/c'

 file is not a filter file
 parse_forward_list: /a/b/c
 extract item: /a/b/c
 file is not a filter file
 parse_forward_list: /a/b/c
 extract item: /a/b/c


@@ -21,7 +21,7 @@ r1 router generated /a/b/c
 routed by r1 router
   envelope to: /a/b/c@myhost.test.ex
   transport: <none>
 routed by r1 router
   envelope to: /a/b/c@myhost.test.ex
   transport: <none>

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

 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user


@@ -32,8 +32,8 @@ routing /x/y/z@myhost.test.ex
 --------> r1 router <--------
 local_part=/x/y/z domain=myhost.test.ex
 calling r1 router
 --------> r1 router <--------
 local_part=/x/y/z domain=myhost.test.ex
 calling r1 router

-rda_interpret (string): $local_part
-expanded: /x/y/z
+rda_interpret (string): '${bless:$local_part}'
+expanded: '/x/y/z'

 file is not a filter file
 parse_forward_list: /x/y/z
 extract item: /x/y/z
 file is not a filter file
 parse_forward_list: /x/y/z
 extract item: /x/y/z


@@ -45,7 +45,7 @@ r1 router generated /x/y/z
 routed by r1 router
   envelope to: /x/y/z@myhost.test.ex
   transport: <none>
 routed by r1 router
   envelope to: /x/y/z@myhost.test.ex
   transport: <none>

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

 LOG: MAIN
   <= fil@ter U=CALLER P=local S=sss
 delivering 10HmaX-0005vi-00
 LOG: MAIN
   <= fil@ter U=CALLER P=local S=sss
 delivering 10HmaX-0005vi-00