Testsuite: fix munging of now-indented date in stdout

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

diff --git a/test/stderr/0357 b/test/stderr/0357
index cae10d04f43c87f4d37ef94a1a724609e69b5981..9cc0a6bb5e336263348ec2d5a1a07c886f99a2f1 100644 (file)
--- a/test/stderr/0357
+++ b/test/stderr/0357
@@ -28,18 +28,18 @@ added retry item for R:userx@test.ex:<CALLER@test.ex>: errno=-44 more_errno=dd,A
 reading retry information for R:userx@test.ex:<CALLER@test.ex> from subprocess
   added retry item
 LOG: MAIN
 reading retry information for R:userx@test.ex:<CALLER@test.ex> from subprocess
   added retry item
 LOG: MAIN

-  == userx@test.ex R=r1 T=t1 defer (-44): SMTP error from remote mail server after RCPT TO:<userx@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
+  == userx@test.ex R=r1 T=t1 defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: 451 Temporary error

 Processing retry items
 Succeeded addresses:
 Failed addresses:
 Deferred addresses:
 Processing retry items
 Succeeded addresses:
 Failed addresses:
 Deferred addresses:

-userx@test.ex
+ userx@test.ex

 locking TESTSUITE/spool/db/retry.lockfile
 retry for R:userx@test.ex:<CALLER@test.ex> = * 0 0
 failing_interval=ttt message_age=ttt
 Writing retry data for R:userx@test.ex:<CALLER@test.ex>
   first failed=dddd last try=dddd next try=+1 expired=0
 locking TESTSUITE/spool/db/retry.lockfile
 retry for R:userx@test.ex:<CALLER@test.ex> = * 0 0
 failing_interval=ttt message_age=ttt
 Writing retry data for R:userx@test.ex:<CALLER@test.ex>
   first failed=dddd last try=dddd next try=+1 expired=0

-  errno=-44 more_errno=dd,A SMTP error from remote mail server after RCPT TO:<userx@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
+  errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: 451 Temporary error

 end of retry processing
 >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
 >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
 end of retry processing
 >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
 >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>


@@ -52,6 +52,7 @@ locking TESTSUITE/spool/db/retry.lockfile
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: userx@test.ex
 no domain retry record
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: userx@test.ex
 no domain retry record

+added retry item for R:userx@test.ex:<CALLER@test.ex>: errno=-1 more_errno=dd flags=1

 added retry item for R:userx@test.ex: errno=-1 more_errno=dd flags=1
 added retry item for R:test.ex: errno=-1 more_errno=dd flags=1
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 added retry item for R:userx@test.ex: errno=-1 more_errno=dd flags=1
 added retry item for R:test.ex: errno=-1 more_errno=dd flags=1
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>


@@ -67,6 +68,7 @@ no host retry record
 no message retry record
 added retry item for R:userx@test.ex:<CALLER@test.ex>: errno=-44 more_errno=dd,A flags=0
 reading retry information for R:userx@test.ex:<CALLER@test.ex> from subprocess
 no message retry record
 added retry item for R:userx@test.ex:<CALLER@test.ex>: errno=-44 more_errno=dd,A flags=0
 reading retry information for R:userx@test.ex:<CALLER@test.ex> from subprocess

+  existing delete item dropped

   added retry item
 reading retry information for R:test.ex from subprocess
   existing delete item dropped
   added retry item
 reading retry information for R:test.ex from subprocess
   existing delete item dropped


@@ -74,13 +76,15 @@ reading retry information for R:test.ex from subprocess
 reading retry information for R:userx@test.ex from subprocess
   existing delete item dropped
   added delete item
 reading retry information for R:userx@test.ex from subprocess
   existing delete item dropped
   added delete item

+reading retry information for R:userx@test.ex:<CALLER@test.ex> from subprocess
+  delete item not added: non-delete item exists

 LOG: MAIN
 LOG: MAIN

-  == userx@test.ex R=r1 T=t1 defer (-44): SMTP error from remote mail server after RCPT TO:<userx@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
+  == userx@test.ex R=r1 T=t1 defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: 451 Temporary error

 Processing retry items
 Succeeded addresses:
 Failed addresses:
 Deferred addresses:
 Processing retry items
 Succeeded addresses:
 Failed addresses:
 Deferred addresses:

-userx@test.ex
+ userx@test.ex

 locking TESTSUITE/spool/db/retry.lockfile
 deleted retry information for R:userx@test.ex
 deleted retry information for R:test.ex
 locking TESTSUITE/spool/db/retry.lockfile
 deleted retry information for R:userx@test.ex
 deleted retry information for R:test.ex


@@ -88,7 +92,7 @@ retry for R:userx@test.ex:<CALLER@test.ex> = * 0 0
 failing_interval=ttt message_age=ttt
 Writing retry data for R:userx@test.ex:<CALLER@test.ex>
   first failed=dddd last try=dddd next try=+1 expired=0
 failing_interval=ttt message_age=ttt
 Writing retry data for R:userx@test.ex:<CALLER@test.ex>
   first failed=dddd last try=dddd next try=+1 expired=0

-  errno=-44 more_errno=dd,A SMTP error from remote mail server after RCPT TO:<userx@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
+  errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: 451 Temporary error

 end of retry processing
 LOG: queue_run MAIN
   End queue run: pid=pppp
 end of retry processing
 LOG: queue_run MAIN
   End queue run: pid=pppp


@@ -102,6 +106,7 @@ locking TESTSUITE/spool/db/retry.lockfile
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: userx@test.ex
 no domain retry record
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: userx@test.ex
 no domain retry record

+added retry item for R:userx@test.ex:<CALLER@test.ex>: errno=-1 more_errno=dd flags=1

 added retry item for R:userx@test.ex: errno=-1 more_errno=dd flags=1
 added retry item for R:test.ex: errno=-1 more_errno=dd flags=1
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 added retry item for R:userx@test.ex: errno=-1 more_errno=dd flags=1
 added retry item for R:test.ex: errno=-1 more_errno=dd flags=1
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>


@@ -117,6 +122,7 @@ no host retry record
 no message retry record
 added retry item for R:userx@test.ex:<CALLER@test.ex>: errno=-44 more_errno=dd,A flags=0
 reading retry information for R:userx@test.ex:<CALLER@test.ex> from subprocess
 no message retry record
 added retry item for R:userx@test.ex:<CALLER@test.ex>: errno=-44 more_errno=dd,A flags=0
 reading retry information for R:userx@test.ex:<CALLER@test.ex> from subprocess

+  existing delete item dropped

   added retry item
 reading retry information for R:test.ex from subprocess
   existing delete item dropped
   added retry item
 reading retry information for R:test.ex from subprocess
   existing delete item dropped


@@ -124,13 +130,15 @@ reading retry information for R:test.ex from subprocess
 reading retry information for R:userx@test.ex from subprocess
   existing delete item dropped
   added delete item
 reading retry information for R:userx@test.ex from subprocess
   existing delete item dropped
   added delete item

+reading retry information for R:userx@test.ex:<CALLER@test.ex> from subprocess
+  delete item not added: non-delete item exists

 LOG: MAIN
 LOG: MAIN

-  == userx@test.ex R=r1 T=t1 defer (-44): SMTP error from remote mail server after RCPT TO:<userx@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
+  == userx@test.ex R=r1 T=t1 defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: 451 Temporary error

 Processing retry items
 Succeeded addresses:
 Failed addresses:
 Deferred addresses:
 Processing retry items
 Succeeded addresses:
 Failed addresses:
 Deferred addresses:

-userx@test.ex
+ userx@test.ex

 locking TESTSUITE/spool/db/retry.lockfile
 deleted retry information for R:userx@test.ex
 deleted retry information for R:test.ex
 locking TESTSUITE/spool/db/retry.lockfile
 deleted retry information for R:userx@test.ex
 deleted retry information for R:test.ex


@@ -138,7 +146,7 @@ retry for R:userx@test.ex:<CALLER@test.ex> = * 0 0
 failing_interval=ttt message_age=ttt
 Writing retry data for R:userx@test.ex:<CALLER@test.ex>
   first failed=dddd last try=dddd next try=+2 expired=0
 failing_interval=ttt message_age=ttt
 Writing retry data for R:userx@test.ex:<CALLER@test.ex>
   first failed=dddd last try=dddd next try=+2 expired=0

-  errno=-44 more_errno=dd,A SMTP error from remote mail server after RCPT TO:<userx@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error
+  errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: 451 Temporary error

 end of retry processing
 LOG: queue_run MAIN
   End queue run: pid=pppp
 end of retry processing
 LOG: queue_run MAIN
   End queue run: pid=pppp


@@ -152,6 +160,9 @@ locking TESTSUITE/spool/db/retry.lockfile
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: userx@test.ex
 no domain retry record
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: userx@test.ex
 no domain retry record

+retry time not reached: checking ultimate address timeout
+  now=tttt first_failed=tttt next_try=tttt expired=0
+  received_time=tttt diff=tttt timeout=3600

 LOG: retry_defer MAIN
   == userx@test.ex routing defer (-51): retry time not reached
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 LOG: retry_defer MAIN
   == userx@test.ex routing defer (-51): retry time not reached
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>


@@ -165,7 +176,7 @@ Processing retry items
 Succeeded addresses:
 Failed addresses:
 Deferred addresses:
 Succeeded addresses:
 Failed addresses:
 Deferred addresses:

-userx@test.ex: no retry items
+ userx@test.ex: no retry items

 end of retry processing
 LOG: queue_run MAIN
   End queue run: pid=pppp
 end of retry processing
 LOG: queue_run MAIN
   End queue run: pid=pppp