Testsuite: output changes resulting

[exim.git] / test / stderr / 0279

diff --git a/test/stderr/0279 b/test/stderr/0279
index 20522440756213ee03279201dce24f226ec45c9f..1885579cbe51cc0ee04807117b855d852f5c2c8b 100644 (file)
--- a/test/stderr/0279
+++ b/test/stderr/0279
@@ -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

 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 configuration file is TESTSUITE/test-config
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 configuration file is TESTSUITE/test-config


@@ -21,33 +21,66 @@ routing CALLER@test.ex
 --------> rr1 router <--------
 local_part=CALLER domain=test.ex
 checking senders
 --------> rr1 router <--------
 local_part=CALLER domain=test.ex
 checking senders

-address match test: subject=CALLER@test.ex pattern=user1@+funny_domains
+CALLER@test.ex in "user1@+funny_domains"?
+ list element: user1@+funny_domains
+ address match test: subject=CALLER@test.ex pattern=user1@+funny_domains

 CALLER@test.ex in "user1@+funny_domains"? no (end of list)
 rr1 router skipped: senders mismatch
 --------> r1 router <--------
 local_part=CALLER domain=test.ex
 checking senders
 CALLER@test.ex in "user1@+funny_domains"? no (end of list)
 rr1 router skipped: senders mismatch
 --------> r1 router <--------
 local_part=CALLER domain=test.ex
 checking senders

-address match test: subject=CALLER@test.ex pattern=never@test.ex
-CALLER@test.ex in "never@test.ex"? no (end of list)
-address match test: subject=CALLER@test.ex pattern=never1@test.ex
-CALLER@test.ex in "never1@test.ex"? no (end of list)
-address match test: subject=CALLER@test.ex pattern=CALLER@test.ex
-test.ex in "test.ex"? yes (matched "test.ex")
-CALLER@test.ex in "CALLER@test.ex"? yes (matched "CALLER@test.ex")
-CALLER@test.ex in "+never_addresses : +n1_addresses : ! +local_addresses"? no (matched "! +local_addresses")
+CALLER@test.ex in "+never_addresses : +n1_addresses : ! +local_addresses"?
+ list element: +never_addresses
+  start sublist never_addresses
+   CALLER@test.ex in "never@test.ex"?
+   ╎list element: never@test.ex
+   ╎address match test: subject=CALLER@test.ex pattern=never@test.ex
+   CALLER@test.ex in "never@test.ex"? no (end of list)
+  end sublist never_addresses
+ list element: +n1_addresses
+  start sublist n1_addresses
+   CALLER@test.ex in "never1@test.ex"?
+   ╎list element: never1@test.ex
+   ╎address match test: subject=CALLER@test.ex pattern=never1@test.ex
+   CALLER@test.ex in "never1@test.ex"? no (end of list)
+  end sublist n1_addresses
+ list element: ! +local_addresses
+  start sublist local_addresses
+   CALLER@test.ex in "CALLER@test.ex"?
+   ╎list element: CALLER@test.ex
+   ╎address match test: subject=CALLER@test.ex pattern=CALLER@test.ex
+   ╎test.ex in "test.ex"?
+   ╎ list element: test.ex
+   ╎ test.ex in "test.ex"? yes (matched "test.ex")
+   ╎CALLER@test.ex in "CALLER@test.ex"? yes (matched "CALLER@test.ex")
+  end sublist local_addresses
+ data from lookup saved for cache for +local_addresses: key 'CALLER@test.ex' value 'CALLER@test.ex'
+ CALLER@test.ex in "+never_addresses : +n1_addresses : ! +local_addresses"? no (matched "! +local_addresses")

 r1 router skipped: senders mismatch
 --------> r2 router <--------
 local_part=CALLER domain=test.ex
 checking senders
 r1 router skipped: senders mismatch
 --------> r2 router <--------
 local_part=CALLER domain=test.ex
 checking senders

-cached no match for +never_addresses
-cached lookup data = NULL
-address match test: subject=CALLER@test.ex pattern=never2@test.ex
-cached no match for +n1_addresses
-cached lookup data = NULL
-CALLER@test.ex in "<; never2@test.ex ; +n1_addresses"? no (end of list)
-cached yes match for +local_addresses
-cached lookup data = NULL
-CALLER@test.ex in "+never_addresses : +n2_addresses : !+local_addresses"? no (matched "!+local_addresses" - cached)
+CALLER@test.ex in "+never_addresses : +n2_addresses : !+local_addresses"?
+ list element: +never_addresses
+  start sublist never_addresses
+ cached no match for +never_addresses
+ cached lookup data = NULL
+ list element: +n2_addresses
+  start sublist n2_addresses
+   CALLER@test.ex in "<; never2@test.ex ; +n1_addresses"?
+   ╎list element: never2@test.ex
+   ╎address match test: subject=CALLER@test.ex pattern=never2@test.ex
+   ╎list element: +n1_addresses
+   ╎ start sublist n1_addresses
+   ╎cached no match for +n1_addresses
+   ╎cached lookup data = NULL
+   CALLER@test.ex in "<; never2@test.ex ; +n1_addresses"? no (end of list)
+  end sublist n2_addresses
+ list element: !+local_addresses
+  start sublist local_addresses
+ cached yes match for +local_addresses
+ cached lookup data = CALLER@test.ex
+ CALLER@test.ex in "+never_addresses : +n2_addresses : !+local_addresses"? no (matched "!+local_addresses" - cached)

 r2 router skipped: senders mismatch
 --------> r3 router <--------
 local_part=CALLER domain=test.ex
 r2 router skipped: senders mismatch
 --------> r3 router <--------
 local_part=CALLER domain=test.ex


@@ -55,9 +88,12 @@ checking for local user
 seeking password data for user "CALLER": using cached result
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 checking senders
 seeking password data for user "CALLER": using cached result
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 checking senders

-cached yes match for +local_addresses
-cached lookup data = NULL
-CALLER@test.ex in "+local_addresses"? yes (matched "+local_addresses" - cached)
+CALLER@test.ex in "+local_addresses"?
+ list element: +local_addresses
+  start sublist local_addresses
+ cached yes match for +local_addresses
+ cached lookup data = CALLER@test.ex
+ CALLER@test.ex in "+local_addresses"? yes (matched "+local_addresses" - cached)

 calling r3 router
 r3 router called for CALLER@test.ex
   domain = test.ex
 calling r3 router
 r3 router called for CALLER@test.ex
   domain = test.ex


@@ -65,15 +101,15 @@ set transport t1
 queued for t1 transport: local_part = CALLER
 domain = test.ex
   errors_to=NULL
 queued for t1 transport: local_part = CALLER
 domain = test.ex
   errors_to=NULL

-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=CALLER

 routed by r3 router
   envelope to: CALLER@test.ex
   transport: t1
 search_tidyup called
 routed by r3 router
   envelope to: CALLER@test.ex
   transport: t1
 search_tidyup called

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

 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=p1235

 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 configuration file is TESTSUITE/test-config
 seeking password data for user "CALLER": cache not available
 getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID
 configuration file is TESTSUITE/test-config


@@ -94,10 +130,18 @@ routing CALLER@test.ex
 --------> rr1 router <--------
 local_part=CALLER domain=test.ex
 checking senders
 --------> rr1 router <--------
 local_part=CALLER domain=test.ex
 checking senders

-address match test: subject=user1@fun.1 pattern=user1@+funny_domains
-fun.1 in "fun.1 : fun.2"? yes (matched "fun.1")
-fun.1 in "+funny_domains"? yes (matched "+funny_domains")
-user1@fun.1 in "user1@+funny_domains"? yes (matched "user1@+funny_domains")
+user1@fun.1 in "user1@+funny_domains"?
+ list element: user1@+funny_domains
+ address match test: subject=user1@fun.1 pattern=user1@+funny_domains
+ fun.1 in "+funny_domains"?
+  list element: +funny_domains
+   start sublist funny_domains
+   ╎fun.1 in "fun.1 : fun.2"?
+   ╎ list element: fun.1
+   ╎ fun.1 in "fun.1 : fun.2"? yes (matched "fun.1")
+   end sublist funny_domains
+  fun.1 in "+funny_domains"? yes (matched "+funny_domains")
+ user1@fun.1 in "user1@+funny_domains"? yes (matched "user1@+funny_domains")

 calling rr1 router
 rda_interpret (string): ':fail: matched *@+funny_domains'
 expanded: ':fail: matched *@+funny_domains'
 calling rr1 router
 rda_interpret (string): ':fail: matched *@+funny_domains'
 expanded: ':fail: matched *@+funny_domains'


@@ -106,4 +150,4 @@ parse_forward_list: :fail: matched *@+funny_domains
 extract item: :fail: matched *@+funny_domains
 rr1 router forced address failure
 search_tidyup called
 extract item: :fail: matched *@+funny_domains
 rr1 router forced address failure
 search_tidyup called

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