Testsuite: more munging for mailq output

[exim.git] / test / stdout / 3500

diff --git a/test/stdout/3500 b/test/stdout/3500
index 87377d644466e4075662bc6d824eaaa0f27c4f8f..ee35a18ba11ba4ddb4c6685512aacec45dd9955c 100644 (file)
--- a/test/stdout/3500
+++ b/test/stdout/3500
@@ -1,7 +1,9 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250-myhost.test.ex Hello CALLER at test.host [10.0.0.1]\r
 250-SIZE 52428800\r
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250-myhost.test.ex Hello CALLER at test.host [10.0.0.1]\r
 250-SIZE 52428800\r

+250-8BITMIME\r

 250-ETRN\r
 250-ETRN\r

+250-VRFY\r

 250-EXPN\r
 250-PIPELINING\r
 250-AUTH CRAM-MD5\r
 250-EXPN\r
 250-PIPELINING\r
 250-AUTH CRAM-MD5\r


@@ -11,12 +13,14 @@
 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

 221 myhost.test.ex closing connection\r
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250-myhost.test.ex Hello CALLER at test.host [10.0.0.1]\r
 250-SIZE 52428800\r
 221 myhost.test.ex closing connection\r
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250-myhost.test.ex Hello CALLER at test.host [10.0.0.1]\r
 250-SIZE 52428800\r

+250-8BITMIME\r

 250-ETRN\r
 250-ETRN\r

+250-VRFY\r

 250-EXPN\r
 250-PIPELINING\r
 250-AUTH CRAM-MD5\r
 250-EXPN\r
 250-PIPELINING\r
 250-AUTH CRAM-MD5\r


@@ -32,7 +36,9 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250-myhost.test.ex Hello test.host [10.0.0.4]\r
 250-SIZE 52428800\r
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250-myhost.test.ex Hello test.host [10.0.0.4]\r
 250-SIZE 52428800\r

+250-8BITMIME\r

 250-ETRN\r
 250-ETRN\r

+250-VRFY\r

 250-EXPN\r
 250-PIPELINING\r
 250 HELP\r
 250-EXPN\r
 250-PIPELINING\r
 250 HELP\r


@@ -45,7 +51,9 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250-myhost.test.ex Hello test.host [10.0.0.1]\r
 250-SIZE 52428800\r
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250-myhost.test.ex Hello test.host [10.0.0.1]\r
 250-SIZE 52428800\r

+250-8BITMIME\r

 250-ETRN\r
 250-ETRN\r

+250-VRFY\r

 250-EXPN\r
 250-PIPELINING\r
 250-AUTH CRAM-MD5\r
 250-EXPN\r
 250-PIPELINING\r
 250-AUTH CRAM-MD5\r


@@ -55,7 +63,7 @@
 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=10HmaY-0005vi-00\r
+250 OK id=10HmaY-000000005vi-0000\r

 
 **** SMTP testing: that is not a real message id!
 
 
 **** SMTP testing: that is not a real message id!
 


@@ -68,7 +76,9 @@
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250-myhost.test.ex Hello test.host [10.0.0.5]\r
 250-SIZE 52428800\r
 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
 250-myhost.test.ex Hello test.host [10.0.0.5]\r
 250-SIZE 52428800\r

+250-8BITMIME\r

 250-ETRN\r
 250-ETRN\r

+250-VRFY\r

 250-EXPN\r
 250-PIPELINING\r
 250-AUTH CRAM-MD5\r
 250-EXPN\r
 250-PIPELINING\r
 250-AUTH CRAM-MD5\r


@@ -78,7 +88,7 @@
 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

 
 **** SMTP testing: that is not a real message id!
 
 
 **** SMTP testing: that is not a real message id!