Retries: rework DB keys, and fix exinext IPv6. Bug 3086

[exim.git] / test / stdout / 0576

diff --git a/test/stdout/0576 b/test/stdout/0576
index a15ecdd5dd3a2d31a4fa3f7c8da979ec9b0a936c..cae3620b187b5a681aefce3749372ba500d3c577 100644 (file)
--- a/test/stdout/0576
+++ b/test/stdout/0576
@@ -1,35 +1,89 @@
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 the.local.host.name Hello CALLER at test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

-250 OK id=10HmaX-0005vi-00\r
+250 OK id=10HmaX-000000005vi-0000\r

 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 Reset OK\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

-250 OK id=10HmaY-0005vi-00\r
+250 OK id=10HmaY-000000005vi-0000\r

 221 the.local.host.name closing connection\r
 ### default q
 221 the.local.host.name closing connection\r
 ### default q

- 0m   sss 10HmaX-0005vi-00 <CALLER@the.local.host.name>
+TTT   sss 10HmaX-000000005vi-0000 <CALLER@the.local.host.name>

           normal@test.ex
 
 ### alternate q
           normal@test.ex
 
 ### alternate q

- 0m   sss 10HmaY-0005vi-00 <CALLER@the.local.host.name>
+TTT   sss 10HmaY-000000005vi-0000 <CALLER@the.local.host.name>

           alternate@test.ex
 
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
           alternate@test.ex
 
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 the.local.host.name Hello CALLER at test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

-250 OK id=10HmaZ-0005vi-00\r
+250 OK id=10HmaZ-000000005vi-0000\r

 221 the.local.host.name closing connection\r
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 221 the.local.host.name closing connection\r
 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r

+250 the.local.host.name Hello CALLER at test\r

 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r
 250 OK\r
 250 Accepted\r
 354 Enter message, ending with "." on a line by itself\r

-250 OK id=10HmbA-0005vi-00\r
+250 OK id=10HmbA-000000005vi-0000\r

 221 the.local.host.name closing connection\r
 221 the.local.host.name closing connection\r

+### load messages
+220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 the.local.host.name Hello CALLER at test\r
+250 OK\r
+250 Accepted\r
+354 Enter message, ending with "." on a line by itself\r
+250 OK id=10HmbB-000000005vi-0000\r
+250 Reset OK\r
+250 OK\r
+250 Accepted\r
+354 Enter message, ending with "." on a line by itself\r
+250 OK id=10HmbC-000000005vi-0000\r
+221 the.local.host.name closing connection\r
+### default q
+TTT   sss 10HmbB-000000005vi-0000 <CALLER@the.local.host.name>
+          normal@test.ex
+
+### alternate q
+TTT   sss 10HmbC-000000005vi-0000 <CALLER@the.local.host.name>
+          alternate@test.ex
+
+### move msg from default to third q
+Message 10HmbB-000000005vi-0000 
+### move msg from alternate q to third q
+Message 10HmbC-000000005vi-0000 
+### third q
+TTT   sss 10HmbB-000000005vi-0000 <CALLER@the.local.host.name>
+          normal@test.ex
+
+TTT   sss 10HmbC-000000005vi-0000 <CALLER@the.local.host.name>
+          alternate@test.ex
+
+Message 10HmbB-000000005vi-0000 Message 10HmbC-000000005vi-0000 
+### default q
+TTT   sss 10HmbB-000000005vi-0000 <CALLER@the.local.host.name>
+          normal@test.ex
+
+TTT   sss 10HmbC-000000005vi-0000 <CALLER@the.local.host.name>
+          alternate@test.ex
+
+### alternate q
+### third q

 
 ******** SERVER ********
 ### default q
 ### alternate q
 
 ******** SERVER ********
 ### default q
 ### alternate q

+### load messages
+### default q
+### alternate q
+### move msg from default to third q
+### move msg from alternate q to third q
+### third q
+### default q
+### alternate q
+### third q