testsuite: tidying

[exim.git] / test / stderr / 0386

diff --git a/test/stderr/0386 b/test/stderr/0386
index 6bcf40f7af43eb1eae12baaa3a38c73c380598eb..6fb8a55369621ae4d682fe9e2924a6ae4a25bdac 100644 (file)
--- a/test/stderr/0386
+++ b/test/stderr/0386
@@ -30,7 +30,7 @@ SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 SMTP<< mail from:<x@y>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 smtp_setup_msg entered
 SMTP<< mail from:<x@y>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0

-log directory space = -1K inodes = -1 check_space = 10240K inodes = 100
+log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100

 SMTP>> 250 OK
 SMTP<< rcpt to:<1@b>
 read ACL from file TESTSUITE/aux-fixed/0386.acl1
 SMTP>> 250 OK
 SMTP<< rcpt to:<1@b>
 read ACL from file TESTSUITE/aux-fixed/0386.acl1


@@ -79,7 +79,7 @@ SMTP<< rset
 SMTP>> 250 Reset OK
 SMTP<< mail from:<x@y>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 SMTP>> 250 Reset OK
 SMTP<< mail from:<x@y>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0

-log directory space = -1K inodes = -1 check_space = 10240K inodes = 100
+log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100

 SMTP>> 250 OK
 SMTP<< rcpt to:<1@b>
 using ACL "TESTSUITE/aux-fixed/0386.acl1"
 SMTP>> 250 OK
 SMTP<< rcpt to:<1@b>
 using ACL "TESTSUITE/aux-fixed/0386.acl1"


@@ -163,7 +163,7 @@ SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 SMTP<< mail from:<x@y>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 smtp_setup_msg entered
 SMTP<< mail from:<x@y>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0

-log directory space = -1K inodes = -1 check_space = 10240K inodes = 100
+log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100

 SMTP>> 250 OK
 SMTP<< rcpt to:<2@b>
 read ACL from file TESTSUITE/aux-fixed/0386.acl2
 SMTP>> 250 OK
 SMTP<< rcpt to:<2@b>
 read ACL from file TESTSUITE/aux-fixed/0386.acl2


@@ -191,7 +191,6 @@ DSN: orcpt: NULL  flags: 0
 SMTP<< data
 SMTP>> 354 Enter message, ending with "." on a line by itself
 search_tidyup called
 SMTP<< data
 SMTP>> 354 Enter message, ending with "." on a line by itself
 search_tidyup called

-host in ignore_fromline_hosts? no (option unset)

 >>Headers received:
 
 search_tidyup called
 >>Headers received:
 
 search_tidyup called


@@ -311,6 +310,7 @@ lock file created
 mailbox TESTSUITE/test-mail/2 is locked
 writing to file TESTSUITE/test-mail/2
 writing data block fd=dddd size=sss timeout=0
 mailbox TESTSUITE/test-mail/2 is locked
 writing to file TESTSUITE/test-mail/2
 writing data block fd=dddd size=sss timeout=0

+cannot use sendfile for body: spoolfile not wireformat

 writing data block fd=dddd size=sss timeout=0
 writing data block fd=dddd size=sss timeout=0
 appendfile yields 0 with errno=dd more_errno=dd
 writing data block fd=dddd size=sss timeout=0
 writing data block fd=dddd size=sss timeout=0
 appendfile yields 0 with errno=dd more_errno=dd


@@ -373,7 +373,6 @@ DSN: orcpt: NULL  flags: 0
 SMTP<< data
 SMTP>> 354 Enter message, ending with "." on a line by itself
 search_tidyup called
 SMTP<< data
 SMTP>> 354 Enter message, ending with "." on a line by itself
 search_tidyup called

-host in ignore_fromline_hosts? no (option unset)

 >>Headers received:
 
 search_tidyup called
 >>Headers received:
 
 search_tidyup called


@@ -492,6 +491,7 @@ lock file created
 mailbox TESTSUITE/test-mail/2 is locked
 writing to file TESTSUITE/test-mail/2
 writing data block fd=dddd size=sss timeout=0
 mailbox TESTSUITE/test-mail/2 is locked
 writing to file TESTSUITE/test-mail/2
 writing data block fd=dddd size=sss timeout=0

+cannot use sendfile for body: spoolfile not wireformat

 writing data block fd=dddd size=sss timeout=0
 writing data block fd=dddd size=sss timeout=0
 appendfile yields 0 with errno=dd more_errno=dd
 writing data block fd=dddd size=sss timeout=0
 writing data block fd=dddd size=sss timeout=0
 appendfile yields 0 with errno=dd more_errno=dd