Testsuite: accept debug & testscript output sizes varying with testhost name

[exim.git] / test / stderr / 2013

diff --git a/test/stderr/2013 b/test/stderr/2013
index 459f7502754c1dfd851e7a29c67649c8e966b688..9ddfc2f66414b723e2344461322ca3d510cd9fc2 100644 (file)
--- a/test/stderr/2013
+++ b/test/stderr/2013
@@ -6,7 +6,7 @@ LOG: queue_run MAIN
 Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected
   SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
   SMTP>> EHLO myhost.test.ex
 Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected
   SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
   SMTP>> EHLO myhost.test.ex

-cmd buf flush 21 bytes
+cmd buf flush ddd bytes

   SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1]
          250-SIZE 52428800
          250-8BITMIME
   SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1]
          250-SIZE 52428800
          250-8BITMIME


@@ -14,10 +14,10 @@ cmd buf flush 21 bytes
          250-STARTTLS
          250 HELP
   SMTP>> STARTTLS
          250-STARTTLS
          250 HELP
   SMTP>> STARTTLS

-cmd buf flush 10 bytes
+cmd buf flush ddd bytes

   SMTP<< 220 TLS go ahead
   SMTP>> EHLO myhost.test.ex
   SMTP<< 220 TLS go ahead
   SMTP>> EHLO myhost.test.ex

-cmd buf flush 21 bytes
+cmd buf flush ddd bytes

   SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1]
          250-SIZE 52428800
          250-8BITMIME
   SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1]
          250-SIZE 52428800
          250-8BITMIME


@@ -26,13 +26,13 @@ cmd buf flush 21 bytes
   SMTP>> MAIL FROM:<CALLER@myhost.test.ex> SIZE=ssss
   SMTP>> RCPT TO:<userx@test.ex>
   SMTP>> DATA
   SMTP>> MAIL FROM:<CALLER@myhost.test.ex> SIZE=ssss
   SMTP>> RCPT TO:<userx@test.ex>
   SMTP>> DATA

-cmd buf flush 78 bytes
+cmd buf flush ddd bytes

   SMTP<< 250 OK
   SMTP<< 250 Accepted
   SMTP<< 354 Enter message, ending with "." on a line by itself
   SMTP<< 250 OK id=10HmaZ-0005vi-00
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
   SMTP<< 250 Accepted
   SMTP<< 354 Enter message, ending with "." on a line by itself
   SMTP<< 250 OK id=10HmaZ-0005vi-00
   SMTP>> EHLO myhost.test.ex

-cmd buf flush 21 bytes
+cmd buf flush ddd bytes

   SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1]
          250-SIZE 52428800
          250-8BITMIME
   SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1]
          250-SIZE 52428800
          250-8BITMIME


@@ -49,10 +49,10 @@ configuration file is TESTSUITE/test-config
 trusted user
 admin user
   SMTP>> STARTTLS
 trusted user
 admin user
   SMTP>> STARTTLS

-cmd buf flush 10 bytes
+cmd buf flush ddd bytes

   SMTP<< 220 TLS go ahead
   SMTP>> EHLO myhost.test.ex
   SMTP<< 220 TLS go ahead
   SMTP>> EHLO myhost.test.ex

-cmd buf flush 21 bytes
+cmd buf flush ddd bytes

   SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1]
          250-SIZE 52428800
          250-8BITMIME
   SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1]
          250-SIZE 52428800
          250-8BITMIME


@@ -61,13 +61,13 @@ cmd buf flush 21 bytes
   SMTP>> MAIL FROM:<CALLER@myhost.test.ex> SIZE=ssss
   SMTP>> RCPT TO:<userx@test.ex>
   SMTP>> DATA
   SMTP>> MAIL FROM:<CALLER@myhost.test.ex> SIZE=ssss
   SMTP>> RCPT TO:<userx@test.ex>
   SMTP>> DATA

-cmd buf flush 78 bytes
+cmd buf flush ddd bytes

   SMTP<< 250 OK
   SMTP<< 250 Accepted
   SMTP<< 354 Enter message, ending with "." on a line by itself
   SMTP<< 250 OK id=10HmbA-0005vi-00
   SMTP>> QUIT
   SMTP<< 250 OK
   SMTP<< 250 Accepted
   SMTP<< 354 Enter message, ending with "." on a line by itself
   SMTP<< 250 OK id=10HmbA-0005vi-00
   SMTP>> QUIT

-cmd buf flush 6 bytes
+cmd buf flush ddd bytes

   SMTP(close)>>
 LOG: MAIN
   => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00"
   SMTP(close)>>
 LOG: MAIN
   => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00"