SRS: fix mismerge

[exim.git] / test / log / 0543

diff --git a/test/log/0543 b/test/log/0543
index bce32c568d1a9a5f4c4be5ea35a809284f350819..5c5b176017da753ad9240df2a7cb217a1124d867 100644 (file)
--- a/test/log/0543
+++ b/test/log/0543
@@ -2,8 +2,8 @@
 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss
 1999-03-02 09:44:33 10HmaY-0005vi-00 H=thisloop.test.ex [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<usery@domain1>: 451 Later, please
 1999-03-02 09:44:33 10HmaY-0005vi-00 == usery@domain1 R=smarthost T=smtp defer (-44) H=thisloop.test.ex [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<usery@domain1>: 451 Later, please
 1999-03-02 09:44:33 10HmaY-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss
 1999-03-02 09:44:33 10HmaY-0005vi-00 H=thisloop.test.ex [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<usery@domain1>: 451 Later, please
 1999-03-02 09:44:33 10HmaY-0005vi-00 == usery@domain1 R=smarthost T=smtp defer (-44) H=thisloop.test.ex [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<usery@domain1>: 451 Later, please

-1999-03-02 09:44:33 Start queue run: pid=pppp
+1999-03-02 09:44:33 Start queue run: pid=p1234

 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@domain1 R=smarthost T=smtp H=thisloop.test.ex [127.0.0.1] C="250 OK"
 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@domain1 R=smarthost T=smtp H=thisloop.test.ex [127.0.0.1] C="250 OK"
 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed

-1999-03-02 09:44:33 10HmaY-0005vi-00 == usery@domain1 routing defer (-51): retry time not reached
-1999-03-02 09:44:33 End queue run: pid=pppp
+1999-03-02 09:44:33 10HmaY-0005vi-00 == usery@domain1 routing defer (-52): retry time not reached
+1999-03-02 09:44:33 End queue run: pid=p1234