Testsuite: do not attempt to open /dev/tty if in -CONTINUE mode

[users/heiko/exim.git] / test / stderr / 0398

diff --git a/test/stderr/0398 b/test/stderr/0398
index 31d3fc2692c8275e166f9029c93f69c6d3f6e054..3e3994b99aec07a13936a9a73a1b71a3c53a58b1 100644 (file)
--- a/test/stderr/0398
+++ b/test/stderr/0398
@@ -18,6 +18,8 @@ LOG: smtp_connection MAIN
 SMTP>> 220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 SMTP<< mail from:<qq@remote>
+spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
+log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP>> 250 OK
 SMTP<< rcpt to:<abc@local>
 using ACL "rcpt"
@@ -117,36 +119,43 @@ routed by r2 router
   host 127.0.0.1 [127.0.0.1]
 Attempting full verification using callout
 locking TESTSUITE/spool/db/callout.lockfile
-locked TESTSUITE/spool/db/callout.lockfile
+locked  TESTSUITE/spool/db/callout.lockfile
 EXIM_DBOPEN(TESTSUITE/spool/db/callout)
 returned from EXIM_DBOPEN
 opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR
 dbfn_read: key=remote
-callout cache: found domain record
+callout cache: found domain record for remote
 dbfn_read: key=qq@remote
-callout cache: no address record found
+callout cache: no address record found for qq@remote
+closed hints database and lockfile
 interface=NULL port=1224
 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 220 Server ready
 127.0.0.1 in hosts_avoid_esmtp? no (option unset)
   SMTP>> EHLO mail.test.ex
+cmd buf flush ddd bytes
   SMTP<< 250 OK
 127.0.0.1 in hosts_require_auth? no (option unset)
   SMTP>> MAIL FROM:<>
+cmd buf flush ddd bytes
   SMTP<< 250 OK
   SMTP>> RCPT TO:<qq@remote>
+cmd buf flush ddd bytes
   SMTP<< 550 Unknown
   SMTP>> QUIT
+cmd buf flush ddd bytes
+  SMTP(close)>>
 locking TESTSUITE/spool/db/callout.lockfile
-locked TESTSUITE/spool/db/callout.lockfile
+locked  TESTSUITE/spool/db/callout.lockfile
 EXIM_DBOPEN(TESTSUITE/spool/db/callout)
 returned from EXIM_DBOPEN
 opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR|O_CREAT
 dbfn_write: key=remote
-wrote callout cache domain record:
+wrote callout cache domain record for remote:
   result=1 postmaster=0 random=0
 dbfn_write: key=qq@remote
-wrote negative callout cache address record
+wrote negative callout cache address record for qq@remote
+closed hints database and lockfile
 ----------- end verify ------------
 l_message: $acl_verify_message
 warn: condition test succeeded in ACL "rcpt"
@@ -218,15 +227,16 @@ routed by r2 router
   host 127.0.0.1 [127.0.0.1]
 Attempting full verification using callout
 locking TESTSUITE/spool/db/callout.lockfile
-locked TESTSUITE/spool/db/callout.lockfile
+locked  TESTSUITE/spool/db/callout.lockfile
 EXIM_DBOPEN(TESTSUITE/spool/db/callout)
 returned from EXIM_DBOPEN
 opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR
 dbfn_read: key=remote
-callout cache: found domain record
+callout cache: found domain record for remote
 dbfn_read: key=qq@remote
-callout cache: found address record
+callout cache: found address record for qq@remote
 callout cache: address record is negative
+closed hints database and lockfile
 ----------- end verify ------------
 l_message: $acl_verify_message
 warn: condition test succeeded in ACL "rcpt"