Testsuite: more munge tweaks

[exim.git] / test / stderr / 3210

diff --git a/test/stderr/3210 b/test/stderr/3210
index b80a287385cbc20c98c925ef521704aa335fc6c8..65bf3955bfedfc424cc8d9f94af82acae302ce25 100644 (file)
--- a/test/stderr/3210
+++ b/test/stderr/3210
@@ -1,11 +1,11 @@
 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
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
-DSN: r1 propagating DSN
 originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME
 sender address = CALLER@test.ex
 Address testing: uid=uuuu gid=EXIM_GID euid=uuuu egid=EXIM_GID
@@ -18,18 +18,28 @@ routing userx@test.ex
 --------> r1 router <--------
 local_part=userx domain=test.ex
 checking domains
-search_open: testdb "NULL"
-search_find: file="NULL"
-  key="defer" partial=-1 affix=NULL starflags=0
-LRU list:
-internal_search_find: file="NULL"
-  type=testdb key="defer"
-database lookup required for defer
-testdb lookup forced DEFER
-lookup deferred: testdb lookup forced DEFER
-test.ex in "testdb;defer"? list match deferred for testdb;defer
-test.ex in "+defer_lookup : test.ex"? list match deferred for +defer_lookup
-test.ex in "! +local_domains"? list match deferred for ! +local_domains
+test.ex in domains?
+ list element: !░+local_domains
+  start sublist local_domains
+   test.ex in "+defer_lookup : test.ex"?
+   ╎list element: +defer_lookup
+   ╎ start sublist defer_lookup
+   ╎  test.ex in "testdb;defer"?
+   ╎   list element: testdb;defer
+   ╎   search_open: testdb "NULL"
+   ╎   search_find: file="NULL"
+   ╎     key="defer" partial=-1 affix=NULL starflags=0 opts=NULL
+   ╎   LRU list:
+   ╎   internal_search_find: file="NULL"
+   ╎     type=testdb key="defer" opts=NULL
+   ╎   database lookup required for defer
+   ╎   testdb lookup forced DEFER
+   ╎   lookup deferred: testdb lookup forced DEFER
+   ╎  test.ex in "testdb;defer"? list match deferred for testdb;defer
+   ╎ end sublist defer_lookup
+   test.ex in "+defer_lookup : test.ex"? list match deferred for +defer_lookup
+  end sublist local_domains
+test.ex in domains? list match deferred for ! +local_domains
 domains check lookup or other defer
 search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=1 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=1 >>>>>>>>>>>>>>>>