Testsuite: munge and shuffle for non-TLS build

[exim.git] / test / log / 0589

diff --git a/test/log/0589 b/test/log/0589
index dcbd6565a08e373885099f255858c2fa822ec185..6742764ca00943817adb28efe5fb838a05481ca1 100644 (file)
--- a/test/log/0589
+++ b/test/log/0589
@@ -1,17 +1,15 @@
 
 ******** SERVER ********
-2017-07-30 18:51:05.712 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port PORT_D
-2017-07-30 18:51:05.712 router    was called for quota_good@test.ex
-2017-07-30 18:51:05.712 transport was called for quota_good@test.ex
-2017-07-30 18:51:05.712 router    was called for quota_fail@test.ex
-2017-07-30 18:51:05.712 transport was called for quota_fail@test.ex
-2017-07-30 18:51:05.712 where='quota' msg='Over quota'
-2017-07-30 18:51:05.712 H=(test) [127.0.0.1] F=<b@test.ex> rejected RCPT <quota_fail@test.ex>: Over quota
-2017-07-30 18:51:05.712 router    was called for route_fail@test.ex
-2017-07-30 18:51:05.712 where='route' msg='Unrouteable address'
-2017-07-30 18:51:05.712 H=(test) [127.0.0.1] F=<c@test.ex> rejected RCPT <route_fail@test.ex>: Unrouteable address
-2017-07-30 18:51:05.712 where='quota' msg='Previous (cached) quota verification failure'
-2017-07-30 18:51:05.712 H=(test) [127.0.0.1] F=<e@test.ex> rejected RCPT <quota_fail@test.ex>: Previous (cached) quota verification failure
-2017-07-30 18:51:05.712 router    was called for route_fail@test.ex
-2017-07-30 18:51:05.712 where='route' msg='Unrouteable address'
-2017-07-30 18:51:05.712 H=(test) [127.0.0.1] F=<f@test.ex> rejected RCPT <route_fail@test.ex>: Unrouteable address
+2017-07-30 18:51:05.712 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D
+2017-07-30 18:51:05.712 10HmaX-000000005vi-0000 <= CALLER@test.ex H=(test) [127.0.0.1] P=smtp S=sss for good@test.ex
+2017-07-30 18:51:05.712 10HmaY-000000005vi-0000 <= CALLER@test.ex H=(test) [127.0.0.1] P=smtp S=sss for bad@test.ex
+2017-07-30 18:51:05.712 10HmaZ-000000005vi-0000 <= CALLER@test.ex H=the.local.host.name [ip4.ip4.ip4.ip4] P=esmtp S=sss for good@test.ex
+2017-07-30 18:51:05.712 10HmaZ-000000005vi-0000 => :blackhole: <good@test.ex> R=rx_dump
+2017-07-30 18:51:05.712 10HmaZ-000000005vi-0000 Completed
+2017-07-30 18:51:05.712 10HmaX-000000005vi-0000 => good@test.ex F=<CALLER@test.ex> R=smtp_try T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] C="250 OK id=10HmaZ-000000005vi-0000"
+2017-07-30 18:51:05.712 10HmaX-000000005vi-0000 Completed
+2017-07-30 18:51:05.712 10HmaY-000000005vi-0000 ** bad@test.ex F=<CALLER@test.ex> R=smtp_try T=send_to_server: message has lines too long for transport
+2017-07-30 18:51:05.712 10HmbA-000000005vi-0000 <= <> R=10HmaY-000000005vi-0000 U=EXIMUSER P=local S=sss for CALLER@test.ex
+2017-07-30 18:51:05.712 10HmbA-000000005vi-0000 => :blackhole: <CALLER@test.ex> R=rx_dump
+2017-07-30 18:51:05.712 10HmbA-000000005vi-0000 Completed
+2017-07-30 18:51:05.712 10HmaY-000000005vi-0000 Completed