Merge branch 'master' into 4.next

[users/jgh/exim.git] / test / stderr / 0360

diff --git a/test/stderr/0360 b/test/stderr/0360
index 76b5216684acac1f51094e96600db9608519d986..527e378930059b3881a72904fc9bb794a6ff072b 100644 (file)
--- a/test/stderr/0360
+++ b/test/stderr/0360
@@ -1,6 +1,9 @@
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
+DSN: v0 propagating DSN
+DSN: r1 propagating DSN
+DSN: r2 propagating DSN
 LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
@@ -8,6 +11,9 @@ Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
+DSN: v0 propagating DSN
+DSN: r1 propagating DSN
+DSN: r2 propagating DSN
 delivering 10HmaX-0005vi-00
 locking TESTSUITE/spool/db/retry.lockfile
 no retry data available
@@ -143,12 +149,15 @@ After routing:
     defer@test.ex
 locking TESTSUITE/spool/db/retry.lockfile
 LOG: MAIN
-  *> unknown@recurse.test.ex.test.ex <cms@test.ex> R=r1 T=t1 H=recurse.test.ex.test.ex [V4NET.99.0.2]
+  *> unknown@recurse.test.ex.test.ex <cms@test.ex> R=r1 T=t1 H=recurse.test.ex.test.ex [V4NET.99.0.2] C="delivery bypassed by -N option"
 >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
 >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
+DSN: v0 propagating DSN
+DSN: r1 propagating DSN
+DSN: r2 propagating DSN
 LOG: queue_run MAIN
   Start queue run: pid=pppp -qf
 locking TESTSUITE/spool/db/retry.lockfile