Debug: fix showing option name for list (vs. list content)

[exim.git] / test / stderr / 5204

diff --git a/test/stderr/5204 b/test/stderr/5204
index 6f3c13e1088ba0269797987c3fd8f83f4fde3c1d..895c87e7b9c89c9021cb7756f60f903a81a3fe83 100644 (file)
--- a/test/stderr/5204
+++ b/test/stderr/5204
@@ -9,10 +9,14 @@ routing "DECLINE cannot route this one (DECLINE)"@some.host
 --------> b router <--------
 local_part=decline cannot route this one (decline) domain=some.host
 checking senders
 --------> b router <--------
 local_part=decline cannot route this one (decline) domain=some.host
 checking senders

+myhost.test.ex in ""? no (end of list)
+CALLER@myhost.test.ex in senders? no (end of list)

 b router skipped: senders mismatch
 --------> q router <--------
 local_part=DECLINE cannot route this one (DECLINE) domain=some.host
 checking domains
 b router skipped: senders mismatch
 --------> q router <--------
 local_part=DECLINE cannot route this one (DECLINE) domain=some.host
 checking domains

+some.host in "test.ex"? no (end of list)
+some.host in domains? yes (end of list)

 calling q router
 q router called for "DECLINE cannot route this one (DECLINE)"@some.host: domain = some.host
 requires uid=EXIM_UID gid=EXIM_GID current_directory=/
 calling q router
 q router called for "DECLINE cannot route this one (DECLINE)"@some.host: domain = some.host
 requires uid=EXIM_UID gid=EXIM_GID current_directory=/


@@ -30,10 +34,14 @@ routing "FAIL cannot route this one (FAIL)"@some.host
 --------> b router <--------
 local_part=fail cannot route this one (fail) domain=some.host
 checking senders
 --------> b router <--------
 local_part=fail cannot route this one (fail) domain=some.host
 checking senders

+myhost.test.ex in ""? no (end of list)
+CALLER@myhost.test.ex in senders? no (end of list)

 b router skipped: senders mismatch
 --------> q router <--------
 local_part=FAIL cannot route this one (FAIL) domain=some.host
 checking domains
 b router skipped: senders mismatch
 --------> q router <--------
 local_part=FAIL cannot route this one (FAIL) domain=some.host
 checking domains

+some.host in "test.ex"? no (end of list)
+some.host in domains? yes (end of list)

 calling q router
 q router called for "FAIL cannot route this one (FAIL)"@some.host: domain = some.host
 requires uid=EXIM_UID gid=EXIM_GID current_directory=/
 calling q router
 q router called for "FAIL cannot route this one (FAIL)"@some.host: domain = some.host
 requires uid=EXIM_UID gid=EXIM_GID current_directory=/


@@ -49,10 +57,14 @@ routing "ERROR cannot route this one (ERROR)"@some.host
 --------> b router <--------
 local_part=error cannot route this one (error) domain=some.host
 checking senders
 --------> b router <--------
 local_part=error cannot route this one (error) domain=some.host
 checking senders

+myhost.test.ex in ""? no (end of list)
+CALLER@myhost.test.ex in senders? no (end of list)

 b router skipped: senders mismatch
 --------> q router <--------
 local_part=ERROR cannot route this one (ERROR) domain=some.host
 checking domains
 b router skipped: senders mismatch
 --------> q router <--------
 local_part=ERROR cannot route this one (ERROR) domain=some.host
 checking domains

+some.host in "test.ex"? no (end of list)
+some.host in domains? yes (end of list)

 calling q router
 q router called for "ERROR cannot route this one (ERROR)"@some.host: domain = some.host
 requires uid=EXIM_UID gid=EXIM_GID current_directory=/
 calling q router
 q router called for "ERROR cannot route this one (ERROR)"@some.host: domain = some.host
 requires uid=EXIM_UID gid=EXIM_GID current_directory=/


@@ -71,10 +83,14 @@ routing "DEFER cannot route this one (DEFER)"@some.host
 --------> b router <--------
 local_part=defer cannot route this one (defer) domain=some.host
 checking senders
 --------> b router <--------
 local_part=defer cannot route this one (defer) domain=some.host
 checking senders

+myhost.test.ex in ""? no (end of list)
+CALLER@myhost.test.ex in senders? no (end of list)

 b router skipped: senders mismatch
 --------> q router <--------
 local_part=DEFER cannot route this one (DEFER) domain=some.host
 checking domains
 b router skipped: senders mismatch
 --------> q router <--------
 local_part=DEFER cannot route this one (DEFER) domain=some.host
 checking domains

+some.host in "test.ex"? no (end of list)
+some.host in domains? yes (end of list)

 calling q router
 q router called for "DEFER cannot route this one (DEFER)"@some.host: domain = some.host
 requires uid=EXIM_UID gid=EXIM_GID current_directory=/
 calling q router
 q router called for "DEFER cannot route this one (DEFER)"@some.host: domain = some.host
 requires uid=EXIM_UID gid=EXIM_GID current_directory=/


@@ -91,10 +107,14 @@ routing "ACCEPT transport = other_smtp hosts=ten-1.test.ex"@some.host
 --------> b router <--------
 local_part=accept transport = other_smtp hosts=ten-1.test.ex domain=some.host
 checking senders
 --------> b router <--------
 local_part=accept transport = other_smtp hosts=ten-1.test.ex domain=some.host
 checking senders

+myhost.test.ex in ""? no (end of list)
+CALLER@myhost.test.ex in senders? no (end of list)

 b router skipped: senders mismatch
 --------> q router <--------
 local_part=ACCEPT transport = other_smtp hosts=ten-1.test.ex domain=some.host
 checking domains
 b router skipped: senders mismatch
 --------> q router <--------
 local_part=ACCEPT transport = other_smtp hosts=ten-1.test.ex domain=some.host
 checking domains

+some.host in "test.ex"? no (end of list)
+some.host in domains? yes (end of list)

 calling q router
 q router called for "ACCEPT transport = other_smtp hosts=ten-1.test.ex"@some.host: domain = some.host
 requires uid=EXIM_UID gid=EXIM_GID current_directory=/
 calling q router
 q router called for "ACCEPT transport = other_smtp hosts=ten-1.test.ex"@some.host: domain = some.host
 requires uid=EXIM_UID gid=EXIM_GID current_directory=/


@@ -119,10 +139,14 @@ routing PASS@some.host
 --------> b router <--------
 local_part=pass domain=some.host
 checking senders
 --------> b router <--------
 local_part=pass domain=some.host
 checking senders

+myhost.test.ex in ""? no (end of list)
+CALLER@myhost.test.ex in senders? no (end of list)

 b router skipped: senders mismatch
 --------> q router <--------
 local_part=PASS domain=some.host
 checking domains
 b router skipped: senders mismatch
 --------> q router <--------
 local_part=PASS domain=some.host
 checking domains

+some.host in "test.ex"? no (end of list)
+some.host in domains? yes (end of list)

 calling q router
 q router called for PASS@some.host: domain = some.host
 requires uid=EXIM_UID gid=EXIM_GID current_directory=/
 calling q router
 q router called for PASS@some.host: domain = some.host
 requires uid=EXIM_UID gid=EXIM_GID current_directory=/


@@ -131,6 +155,7 @@ q router passed for PASS@some.host
 --------> s router <--------
 local_part=pass domain=some.host
 checking domains
 --------> s router <--------
 local_part=pass domain=some.host
 checking domains

+some.host in domains? yes (end of list)

 calling s router
 s router called for PASS@some.host
   domain = some.host
 calling s router
 s router called for PASS@some.host
   domain = some.host


@@ -159,10 +184,14 @@ routing "FREEZE cannot route this one (FREEZE)"@some.host
 --------> b router <--------
 local_part=freeze cannot route this one (freeze) domain=some.host
 checking senders
 --------> b router <--------
 local_part=freeze cannot route this one (freeze) domain=some.host
 checking senders

+myhost.test.ex in ""? no (end of list)
+CALLER@myhost.test.ex in senders? no (end of list)

 b router skipped: senders mismatch
 --------> q router <--------
 local_part=FREEZE cannot route this one (FREEZE) domain=some.host
 checking domains
 b router skipped: senders mismatch
 --------> q router <--------
 local_part=FREEZE cannot route this one (FREEZE) domain=some.host
 checking domains

+some.host in "test.ex"? no (end of list)
+some.host in domains? yes (end of list)

 calling q router
 q router called for "FREEZE cannot route this one (FREEZE)"@some.host: domain = some.host
 requires uid=EXIM_UID gid=EXIM_GID current_directory=/
 calling q router
 q router called for "FREEZE cannot route this one (FREEZE)"@some.host: domain = some.host
 requires uid=EXIM_UID gid=EXIM_GID current_directory=/


@@ -179,10 +208,14 @@ routing "REDIRECT postmaster@test.ex"@some.host
 --------> b router <--------
 local_part=redirect postmaster@test.ex domain=some.host
 checking senders
 --------> b router <--------
 local_part=redirect postmaster@test.ex domain=some.host
 checking senders

+myhost.test.ex in ""? no (end of list)
+CALLER@myhost.test.ex in senders? no (end of list)

 b router skipped: senders mismatch
 --------> q router <--------
 local_part=REDIRECT postmaster@test.ex domain=some.host
 checking domains
 b router skipped: senders mismatch
 --------> q router <--------
 local_part=REDIRECT postmaster@test.ex domain=some.host
 checking domains

+some.host in "test.ex"? no (end of list)
+some.host in domains? yes (end of list)

 calling q router
 q router called for "REDIRECT postmaster@test.ex"@some.host: domain = some.host
 requires uid=EXIM_UID gid=EXIM_GID current_directory=/
 calling q router
 q router called for "REDIRECT postmaster@test.ex"@some.host: domain = some.host
 requires uid=EXIM_UID gid=EXIM_GID current_directory=/


@@ -201,6 +234,8 @@ routing postmaster@test.ex
 --------> b router <--------
 local_part=postmaster domain=test.ex
 checking senders
 --------> b router <--------
 local_part=postmaster domain=test.ex
 checking senders

+myhost.test.ex in ""? no (end of list)
+CALLER@myhost.test.ex in senders? no (end of list)

 b router skipped: senders mismatch
 --------> q router <--------
 local_part=postmaster domain=test.ex
 b router skipped: senders mismatch
 --------> q router <--------
 local_part=postmaster domain=test.ex


@@ -257,21 +292,23 @@ routing "FAIL cannot route this one (FAIL)"@some.host
 --------> b router <--------
 local_part=fail cannot route this one (fail) domain=some.host
 checking senders
 --------> b router <--------
 local_part=fail cannot route this one (fail) domain=some.host
 checking senders

-x@y in ":"?
+x@y in senders?

  list element: 
  y in ""?
  y in ""? no (end of list)
  list element: 
  y in ""?
  y in ""? no (end of list)

-x@y in ":"? no (end of list)
+x@y in senders? no (end of list)

 b router skipped: senders mismatch
 --------> q router <--------
 local_part=FAIL cannot route this one (FAIL) domain=some.host
 checking domains
 b router skipped: senders mismatch
 --------> q router <--------
 local_part=FAIL cannot route this one (FAIL) domain=some.host
 checking domains

-some.host in "! +local_domains"?
- list element: ! +local_domains
- some.host in "test.ex"?
-  list element: test.ex
- some.host in "test.ex"? no (end of list)
-some.host in "! +local_domains"? yes (end of list)
+some.host in domains?
+ list element: !░+local_domains
+  start sublist local_domains
+   some.host in "test.ex"?
+   ╎list element: test.ex
+   some.host in "test.ex"? no (end of list)
+  end sublist local_domains
+some.host in domains? yes (end of list)

 calling q router
 q router called for "FAIL cannot route this one (FAIL)"@some.host: domain = some.host
 requires uid=CALLER_UID gid=CALLER_GID current_directory=/
 calling q router
 q router called for "FAIL cannot route this one (FAIL)"@some.host: domain = some.host
 requires uid=CALLER_UID gid=CALLER_GID current_directory=/