[exim-dev] testsuite issues

Pàgina inicial
Delete this message
Reply to this message
Autor: Martin Mrazik
Data:  
A: exim-dev
Assumpte: [exim-dev] testsuite issues
Hi,

I was playing with the testsuite (latest testsuite-snapshot with exim-4.62) a
bit and found a few issues. Attached is a proposed patch to solve most of
them.

Also I think it would be nice to have an option (-NOINTERACTIVE ?) to run the
tests in non-interactive mode. My idea is to run the testsuite and at the
end just collect some statistical data and logs. What do you think about
this? I'm willing to implement it.



i) parm_ipv6r
    Since I have no ipv6 connection $parm_ipv6r was empty and thus spaces in 
munged files were substituted with "ip6-reverse" string (-> all tests fail). 
I simply intitialized $parm_ipv6r to $parm_ipv6 (see the patch).



ii) PID_FILE_PATH
    if exim was build with PID_FILE_PATH this path is used to store pid even 
while -bdf option is used (talking about test-harness mode) -> those tests 
which expect this file in spool directory will fail
 Solution: add -oP whenever -bdf is used (patch attached)



iii) apparently there must exists a group CALLER and the caller must be member
of this group (confs/0176, confs/0272). This is not mentioned in the README
file (not included in the patch).


iv) assumptions about file descriptors 
    the testsuite expects  fd's 0-2 are opened. However in my environment fd 4 
is opened (~/.fonts.cache-2) as well causing many tests to fail (stderr/ 
outputs are not valid for me). I changed the templates to "fd=dddd" -  patch 
attached.


Test 0142 "(open file descriptor test)" still fails but I consider this okay.


v) "Values in spool space failure message"

    runtest script doesn't expect that inodes might be "-1" :


s/space=\d+ inodes=\d+/space=xxxxx inodes=xxxxx/;
added "[+-]?" (see the attached patch)


vi) test 0027
I have different output - see the attached patch for log/0027 and
rejectlog/0027. (I'm not sure if this patch is correct but I was not able to
find any exim code which would print logs like [reject]log/0027 thus I
suppose this patch is fine)


vii) From time to time some tests are failing due to bin/server timeout. I
would consider raising the default timeout to 10s (not included in the patch)

Sometimes test 0461 is failing too and I'm suspecting timeouts in confs.


viii) Output formatting problems.
My ls(1) is using different time/date format than expected and thus # 0345 is
failing. I would consider making a file like KNOWN_ISSUES - list of tests
likely to fail due to formatting and/or other errors.

I have some troubles with 0476 and 0529 as well:

Line 73 of "test-stderr-munged" does not match lines 73-74 of "stderr/0529".
----------
now=1152723074 received_time=1152636673 diff=86401 timeout=259200
----------
now=tttt first_failed=tttt next_try=tttt expired=0
received_time=tttt diff=tttt timeout=259200
===============
1 difference found.

Any idea what might be wrong? For me it seems this is just a different output
formatting.


ix)
I was not able to find out why tests 0291 and 0104 are failing. In both cases
the testsuite is expecting the [duplicate, would not be delivered] string but
apparently my exim is not printing this. Any clue?
----------
c@one
----------
c@one [duplicate, would not be delivered]




regards,



--
Martin Mrazik, QA Developer
mmrazik@???
diff -Naur exim-testsuite-snapshot.old/log/0027 exim-testsuite-snapshot/log/0027
--- exim-testsuite-snapshot.old/log/0027    2006-07-09 22:16:50.000000000 -0400
+++ exim-testsuite-snapshot/log/0027    2006-07-12 11:59:17.000000000 -0400
@@ -5,7 +5,7 @@
 1999-03-02 09:44:33 U=CALLER F=<> temporarily rejected RCPT <"deny verify = header_syntax"@???>: cannot check header contents in ACL for RCPT (only possible in ACL for DATA)
 1999-03-02 09:44:33 U=CALLER F=<> temporarily rejected RCPT <"deny verify = junk"@???>: expected "sender[=address]", "recipient", "helo", "header_syntax", "header_sender" or "reverse_host_lookup" at start of ACL condition "verify junk"
 1999-03-02 09:44:33 U=CALLER F=<> temporarily rejected RCPT <"deny vorify = junk"@???>: unknown ACL condition/modifier in "deny vorify = junk"
-1999-03-02 09:44:33 U=CALLER F=<> temporarily rejected RCPT <"dony verify = junk"@???>: unknown ACL verb "dony" in "dony verify = junk"
+1999-03-02 09:44:33 U=CALLER F=<> temporarily rejected RCPT <"dony verify = junk"@???>: unknown ACL verb in "dony verify = junk"
 1999-03-02 09:44:33 U=CALLER F=<> temporarily rejected RCPT <"deny !message = abcd"@???>: ACL error: negation is not allowed with "message"
 1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<> temporarily rejected after DATA: cannot verify recipient in ACL for DATA (only possible for RCPT)
 1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<> temporarily rejected after DATA: cannot test domains condition in DATA ACL
diff -Naur exim-testsuite-snapshot.old/rejectlog/0027 exim-testsuite-snapshot/rejectlog/0027
--- exim-testsuite-snapshot.old/rejectlog/0027    2006-07-12 11:51:21.000000000 -0400
+++ exim-testsuite-snapshot/rejectlog/0027    2006-07-12 11:59:23.000000000 -0400
@@ -5,7 +5,7 @@
 1999-03-02 09:44:33 U=CALLER F=<> temporarily rejected RCPT <"deny verify = header_syntax"@???>: cannot check header contents in ACL for RCPT (only possible in ACL for DATA)
 1999-03-02 09:44:33 U=CALLER F=<> temporarily rejected RCPT <"deny verify = junk"@???>: expected "sender[=address]", "recipient", "helo", "header_syntax", "header_sender" or "reverse_host_lookup" at start of ACL condition "verify junk"
 1999-03-02 09:44:33 U=CALLER F=<> temporarily rejected RCPT <"deny vorify = junk"@???>: unknown ACL condition/modifier in "deny vorify = junk"
-1999-03-02 09:44:33 U=CALLER F=<> temporarily rejected RCPT <"dony verify = junk"@???>: unknown ACL verb "dony" in "dony verify = junk"
+1999-03-02 09:44:33 U=CALLER F=<> temporarily rejected RCPT <"dony verify = junk"@???>: unknown ACL verb in "dony verify = junk"
 1999-03-02 09:44:33 U=CALLER F=<> temporarily rejected RCPT <"deny !message = abcd"@???>: ACL error: negation is not allowed with "message"
 1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<> temporarily rejected after DATA: cannot verify recipient in ACL for DATA (only possible for RCPT)
 Envelope-from: <>
diff -Naur exim-testsuite-snapshot.old/runtest exim-testsuite-snapshot/runtest
--- exim-testsuite-snapshot.old/runtest    2006-07-09 22:16:50.000000000 -0400
+++ exim-testsuite-snapshot/runtest    2006-07-12 11:59:23.000000000 -0400
@@ -358,6 +358,10 @@
   # Random local part in callout cache testing
   s/myhost.test.ex-\d+-testing/myhost.test.ex-dddddddd-testing/;


+ # The file descriptor may vary
+ s/^writing data block fd=\d+/writing data block fd=dddd/;
+ s/running as transport filter: write=\d+ read=\d+/running as transport filter: write=dddd read=dddd/;
+

# ======== Dumpdb output ========
# This must be before the general date/date munging.
@@ -585,7 +589,7 @@


# ======== Values in spool space failure message ========
- s/space=\d+ inodes=\d+/space=xxxxx inodes=xxxxx/;
+ s/space=\d+ inodes=[+-]?\d+/space=xxxxx inodes=xxxxx/;


   # ======== Filter sizes ========
@@ -1687,8 +1691,12 @@
     # Before running the command, convert the -bd option into -bdf so that an
     # Exim daemon doesn't double fork. This means that when we wait close
     # DAEMONCMD, it waits for the correct process.
+    # 
+    # We need to override PID_FILE_PATH when exim was build with
+    # PID_FILE_PATH. In such case we want to explicitly define the pid-file
+    # using -oP


-    $cmd =~ s/\s-bd\s/ -bdf /;
+    $cmd =~ s,\s-bd\s, -bdf -oP $parm_cwd/spool/exim-daemon.pid ,;
     print ">> |${cmd}-server\n" if ($debug);
     open DAEMONCMD, "|${cmd}-server" || tests_exit(-1, "Failed to run $cmd");
     DAEMONCMD->autoflush(1);
@@ -2412,7 +2420,7 @@
 $parm_ipv4r = ($parm_ipv4 !~ /^\d/)? "" :
   join(".", reverse(split /\./, $parm_ipv4));


-$parm_ipv6r = "";
+$parm_ipv6r = $parm_ipv6;
 if ($parm_ipv6 =~ /^[\da-f]/)
   {
   my(@comps) = split /:/, $parm_ipv6;
diff -Naur exim-testsuite-snapshot.old/stderr/0143 exim-testsuite-snapshot/stderr/0143
--- exim-testsuite-snapshot.old/stderr/0143    2006-07-09 22:16:12.000000000 -0400
+++ exim-testsuite-snapshot/stderr/0143    2006-07-12 11:59:23.000000000 -0400
@@ -29,7 +29,7 @@
   SMTP>> DATA
   SMTP<< 354 Send data
   SMTP>> writing message and terminating "."
-writing data block fd=6 size=sss timeout=300
+writing data block fd=dddd size=sss timeout=300
   SMTP<< 250 OK
 ok=1 send_quit=1 send_rset=0 continue_more=0 yield=0 first_address is NULL
 transport_check_waiting entered
diff -Naur exim-testsuite-snapshot.old/stderr/0169 exim-testsuite-snapshot/stderr/0169
--- exim-testsuite-snapshot.old/stderr/0169    2006-07-09 22:16:12.000000000 -0400
+++ exim-testsuite-snapshot/stderr/0169    2006-07-12 11:59:23.000000000 -0400
@@ -23,9 +23,9 @@
 writing to file TESTSUITE/test-mail/userx
 Exim quota = 52428800 old size = sssss this message = sss (included)
   file count quota = 0 count = 0
-writing data block fd=6 size=sss timeout=0
-writing data block fd=6 size=sss timeout=0
-writing data block fd=6 size=sss timeout=0
+writing data block fd=dddd size=sss timeout=0
+writing data block fd=dddd size=sss timeout=0
+writing data block fd=dddd size=sss timeout=0
 quota = 52428800 threshold = 21495808 old size = sssss message size = sss
 appendfile yields 0 with errno=dd more_errno=dd
 appendfile transport returned OK for userx@???
diff -Naur exim-testsuite-snapshot.old/stderr/0370 exim-testsuite-snapshot/stderr/0370
--- exim-testsuite-snapshot.old/stderr/0370    2006-07-09 22:16:13.000000000 -0400
+++ exim-testsuite-snapshot/stderr/0370    2006-07-12 11:59:23.000000000 -0400
@@ -22,7 +22,7 @@
 direct command:
   argv[0] = TESTSUITE/bin/iefbr14
 Writing message to pipe
-writing data block fd=8 size=sss timeout=3600
+writing data block fd=dddd size=sss timeout=3600
 writing error 32: Broken pipe
 transport error EPIPE ignored
 t1 transport yielded 0
diff -Naur exim-testsuite-snapshot.old/stderr/0386 exim-testsuite-snapshot/stderr/0386
--- exim-testsuite-snapshot.old/stderr/0386    2006-07-09 22:16:13.000000000 -0400
+++ exim-testsuite-snapshot/stderr/0386    2006-07-12 11:59:23.000000000 -0400
@@ -270,9 +270,9 @@
 lock file created
 mailbox TESTSUITE/test-mail/2 is locked
 writing to file TESTSUITE/test-mail/2
-writing data block fd=10 size=sss timeout=0
-writing data block fd=10 size=sss timeout=0
-writing data block fd=10 size=sss timeout=0
+writing data block fd=dddd size=sss timeout=0
+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
 search_tidyup called
 journalling 2@b
@@ -424,9 +424,9 @@
 lock file created
 mailbox TESTSUITE/test-mail/2 is locked
 writing to file TESTSUITE/test-mail/2
-writing data block fd=10 size=sss timeout=0
-writing data block fd=10 size=sss timeout=0
-writing data block fd=10 size=sss timeout=0
+writing data block fd=dddd size=sss timeout=0
+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
 search_tidyup called
 journalling 2@b
diff -Naur exim-testsuite-snapshot.old/stderr/0393 exim-testsuite-snapshot/stderr/0393
--- exim-testsuite-snapshot.old/stderr/0393    2006-07-09 22:16:13.000000000 -0400
+++ exim-testsuite-snapshot/stderr/0393    2006-07-12 11:59:23.000000000 -0400
@@ -26,16 +26,16 @@
 lock file created
 mailbox TESTSUITE/test-mail/userx is locked
 writing to file TESTSUITE/test-mail/userx
-writing data block fd=6 size=sss timeout=0
-process pppp running as transport filter: write=9 read=10
-writing data block fd=9 size=sss timeout=0
+writing data block fd=dddd size=sss timeout=0
+process pppp running as transport filter: write=dddd read=dddd
+writing data block fd=dddd size=sss timeout=0
 process pppp writing to transport filter
 copying from the filter
 waiting for filter process
 waiting for writing process
-writing data block fd=6 size=sss timeout=0
+writing data block fd=dddd size=sss timeout=0
 end of filtering transport writing: yield=1
-writing data block fd=6 size=sss timeout=0
+writing data block fd=dddd size=sss timeout=0
 appendfile yields 0 with errno=dd more_errno=dd
 t1 transport returned OK for userx@???
 LOG: MAIN
@@ -69,9 +69,9 @@
 lock file created
 mailbox TESTSUITE/test-mail/userx is locked
 writing to file TESTSUITE/test-mail/userx
-writing data block fd=6 size=sss timeout=0
-process pppp running as transport filter: write=9 read=10
-writing data block fd=9 size=sss timeout=0
+writing data block fd=dddd size=sss timeout=0
+process pppp running as transport filter: write=dddd read=dddd
+writing data block fd=dddd size=sss timeout=0
 writing error 32: Broken pipe
 process pppp writing to transport filter
 copying from the filter
diff -Naur exim-testsuite-snapshot.old/stderr/0402 exim-testsuite-snapshot/stderr/0402
--- exim-testsuite-snapshot.old/stderr/0402    2006-07-09 22:16:13.000000000 -0400
+++ exim-testsuite-snapshot/stderr/0402    2006-07-12 11:59:23.000000000 -0400
@@ -364,9 +364,9 @@


    result: From CALLER@??? Tue Mar 02 09:44:33 1999


-writing data block fd=6 size=sss timeout=0
-writing data block fd=6 size=sss timeout=0
-writing data block fd=6 size=sss timeout=0
+writing data block fd=dddd size=sss timeout=0
+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
search_tidyup called
journalling TESTSUITE/test-mail/junk:rd+usery@???
@@ -412,9 +412,9 @@

    result: From CALLER@??? Tue Mar 02 09:44:33 1999


-writing data block fd=7 size=sss timeout=0
-writing data block fd=7 size=sss timeout=0
-writing data block fd=7 size=sss timeout=0
+writing data block fd=dddd size=sss timeout=0
+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
 search_tidyup called
 journalling TESTSUITE/test-mail/junk:rd+CALLER@???
diff -Naur exim-testsuite-snapshot.old/stderr/0404 exim-testsuite-snapshot/stderr/0404
--- exim-testsuite-snapshot.old/stderr/0404    2006-07-09 22:16:13.000000000 -0400
+++ exim-testsuite-snapshot/stderr/0404    2006-07-12 11:59:23.000000000 -0400
@@ -15531,10 +15531,10 @@
 lock file created
 mailbox TESTSUITE/test-mail/sender is locked
 writing to file TESTSUITE/test-mail/sender
-writing data block fd=6 size=sss timeout=0
-writing data block fd=6 size=sss timeout=0
-writing data block fd=6 size=sss timeout=0
-writing data block fd=6 size=sss timeout=0
+writing data block fd=dddd size=sss timeout=0
+writing data block fd=dddd size=sss timeout=0
+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
 search_tidyup called
 journalling sender@???
diff -Naur exim-testsuite-snapshot.old/stderr/0408 exim-testsuite-snapshot/stderr/0408
--- exim-testsuite-snapshot.old/stderr/0408    2006-07-09 22:16:13.000000000 -0400
+++ exim-testsuite-snapshot/stderr/0408    2006-07-12 11:59:23.000000000 -0400
@@ -141,9 +141,9 @@
 lock file created
 mailbox TESTSUITE/test-mail/userx is locked
 writing to file TESTSUITE/test-mail/userx
-writing data block fd=6 size=sss timeout=0
-writing data block fd=6 size=sss timeout=0
-writing data block fd=6 size=sss timeout=0
+writing data block fd=dddd size=sss timeout=0
+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
 search_tidyup called
 journalling userx@???
diff -Naur exim-testsuite-snapshot.old/stderr/0476 exim-testsuite-snapshot/stderr/0476
--- exim-testsuite-snapshot.old/stderr/0476    2006-07-09 22:16:14.000000000 -0400
+++ exim-testsuite-snapshot/stderr/0476    2006-07-12 11:59:23.000000000 -0400
@@ -43,7 +43,7 @@
 LOG: MAIN
   ** userx@??? R=r1 T=t1: SMTP error from remote mail server after RCPT TO:<userx@???>: host 127.0.0.1 [127.0.0.1]: 550 NO
 set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00
-writing data block fd=9 size=sss timeout=0
+writing data block fd=dddd size=sss timeout=0
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
diff -Naur exim-testsuite-snapshot.old/stderr/0487 exim-testsuite-snapshot/stderr/0487
--- exim-testsuite-snapshot.old/stderr/0487    2006-07-09 22:16:14.000000000 -0400
+++ exim-testsuite-snapshot/stderr/0487    2006-07-12 11:59:23.000000000 -0400
@@ -135,11 +135,11 @@
 lock file created
 mailbox TESTSUITE/test-mail/userx is locked
 writing to file TESTSUITE/test-mail/userx
-writing data block fd=6 size=sss timeout=0
+writing data block fd=dddd size=sss timeout=0
 rewrite_one_header: type=F:
   From: unqualified
-writing data block fd=6 size=sss timeout=0
-writing data block fd=6 size=sss timeout=0
+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
 search_tidyup called
 journalling userx@???
diff -Naur exim-testsuite-snapshot.old/stderr/0512 exim-testsuite-snapshot/stderr/0512
--- exim-testsuite-snapshot.old/stderr/0512    2006-07-09 22:16:14.000000000 -0400
+++ exim-testsuite-snapshot/stderr/0512    2006-07-12 11:59:23.000000000 -0400
@@ -57,7 +57,7 @@
   == userx@??? R=r1 T=t1 defer (dd): Connection refused
 LOG: MAIN
   ** userx@???: retry timeout exceeded
-writing data block fd=9 size=sss timeout=0
+writing data block fd=dddd size=sss timeout=0
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
@@ -118,7 +118,7 @@
   == userx@??? R=r1 T=t1 defer (dd): Connection refused
 LOG: MAIN
   ** userx@???: retry timeout exceeded
-writing data block fd=9 size=sss timeout=0
+writing data block fd=dddd size=sss timeout=0
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
diff -Naur exim-testsuite-snapshot.old/stderr/2600 exim-testsuite-snapshot/stderr/2600
--- exim-testsuite-snapshot.old/stderr/2600    2006-07-09 22:16:14.000000000 -0400
+++ exim-testsuite-snapshot/stderr/2600    2006-07-12 11:59:23.000000000 -0400
@@ -404,9 +404,9 @@
 lock file created
 mailbox TESTSUITE/test-mail/userx is locked
 writing to file TESTSUITE/test-mail/userx
-writing data block fd=8 size=sss timeout=0
-writing data block fd=8 size=sss timeout=0
-writing data block fd=8 size=sss timeout=0
+writing data block fd=dddd size=sss timeout=0
+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
 search_tidyup called
 journalling userx@???
diff -Naur exim-testsuite-snapshot.old/stderr/5004 exim-testsuite-snapshot/stderr/5004
--- exim-testsuite-snapshot.old/stderr/5004    2006-07-09 22:16:15.000000000 -0400
+++ exim-testsuite-snapshot/stderr/5004    2006-07-12 11:59:23.000000000 -0400
@@ -136,7 +136,7 @@
 created directory TESTSUITE/test-mail/cur
 delivering in maildir format in TESTSUITE/test-mail
 writing to tmp/MAILDIR.mail.test.ex
-writing data block fd=6 size=sss timeout=0
+writing data block fd=dddd size=sss timeout=0
 renaming temporary file
 renamed tmp/MAILDIR.mail.test.ex as new/MAILDIR.mail.test.ex
 appendfile yields 0 with errno=dd more_errno=dd
diff -Naur exim-testsuite-snapshot.old/stderr/5005 exim-testsuite-snapshot/stderr/5005
--- exim-testsuite-snapshot.old/stderr/5005    2006-07-09 22:16:15.000000000 -0400
+++ exim-testsuite-snapshot/stderr/5005    2006-07-12 11:59:23.000000000 -0400
@@ -132,7 +132,7 @@
 writing to tmp/MAILDIR.myhost.test.ex
 Exim quota = 500 old size = sssss this message = sss (included)
   file count quota = 0 count = 0
-writing data block fd=8 size=sss timeout=0
+writing data block fd=dddd size=sss timeout=0
 added 'ddd 1' to maildirsize file
 renaming temporary file
 renamed tmp/MAILDIR.myhost.test.ex as new/MAILDIR.myhost.test.ex
@@ -296,7 +296,7 @@
 writing to tmp/MAILDIR.myhost.test.ex
 Exim quota = 500 old size = sssss this message = sss (included)
   file count quota = 0 count = 0
-writing data block fd=8 size=sss timeout=0
+writing data block fd=dddd size=sss timeout=0
 added 'ddd 1' to maildirsize file
 renaming temporary file
 renamed tmp/MAILDIR.myhost.test.ex as new/MAILDIR.myhost.test.ex
diff -Naur exim-testsuite-snapshot.old/stderr/5006 exim-testsuite-snapshot/stderr/5006
--- exim-testsuite-snapshot.old/stderr/5006    2006-07-09 22:16:15.000000000 -0400
+++ exim-testsuite-snapshot/stderr/5006    2006-07-12 11:59:23.000000000 -0400
@@ -130,7 +130,7 @@
 returning maildir size=sss filecount=0
 delivering in maildir format in TESTSUITE/test-mail/userx
 writing to tmp/MAILDIR.myhost.test.ex
-writing data block fd=8 size=sss timeout=0
+writing data block fd=dddd size=sss timeout=0
 added 'ddd 1' to maildirsize file
 renaming temporary file
 renamed tmp/MAILDIR.myhost.test.ex as new/MAILDIR.myhost.test.ex
diff -Naur exim-testsuite-snapshot.old/stderr/5008 exim-testsuite-snapshot/stderr/5008
--- exim-testsuite-snapshot.old/stderr/5008    2006-07-09 22:16:16.000000000 -0400
+++ exim-testsuite-snapshot/stderr/5008    2006-07-12 11:59:23.000000000 -0400
@@ -25,7 +25,7 @@
 writing to tmp/MAILDIR.myhost.test.ex
 Exim quota = 1048576 old size = sssss this message = sss (included)
   file count quota = 0 count = -1
-writing data block fd=6 size=sss timeout=0
+writing data block fd=dddd size=sss timeout=0
 renaming temporary file
 renamed tmp/MAILDIR.myhost.test.ex as new/MAILDIR.myhost.test.ex
 appendfile yields 0 with errno=dd more_errno=dd
@@ -64,7 +64,7 @@
 writing to tmp/MAILDIR.myhost.test.ex
 Exim quota = 1048576 old size = sssss this message = sss (included)
   file count quota = 20 count = 4
-writing data block fd=6 size=sss timeout=0
+writing data block fd=dddd size=sss timeout=0
 renaming temporary file
 renamed tmp/MAILDIR.myhost.test.ex as new/MAILDIR.myhost.test.ex
 appendfile yields 0 with errno=dd more_errno=dd
diff -Naur exim-testsuite-snapshot.old/stderr/9100 exim-testsuite-snapshot/stderr/9100
--- exim-testsuite-snapshot.old/stderr/9100    2006-07-09 22:16:16.000000000 -0400
+++ exim-testsuite-snapshot/stderr/9100    2006-07-12 11:59:23.000000000 -0400
@@ -317,9 +317,9 @@
 lock file created
 mailbox TESTSUITE/test-mail/CALLER is locked
 writing to file TESTSUITE/test-mail/CALLER
-writing data block fd=8 size=sss timeout=0
-writing data block fd=8 size=sss timeout=0
-writing data block fd=8 size=sss timeout=0
+writing data block fd=dddd size=sss timeout=0
+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
 search_tidyup called
 close MYSQL connection: localhost/test/root
diff -Naur exim-testsuite-snapshot.old/stderr/9200 exim-testsuite-snapshot/stderr/9200
--- exim-testsuite-snapshot.old/stderr/9200    2006-07-09 22:16:16.000000000 -0400
+++ exim-testsuite-snapshot/stderr/9200    2006-07-12 11:59:23.000000000 -0400
@@ -341,9 +341,9 @@
 lock file created
 mailbox TESTSUITE/test-mail/CALLER is locked
 writing to file TESTSUITE/test-mail/CALLER
-writing data block fd=8 size=sss timeout=0
-writing data block fd=8 size=sss timeout=0
-writing data block fd=8 size=sss timeout=0
+writing data block fd=dddd size=sss timeout=0
+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
 search_tidyup called
 close PGSQL connection: localhost/test/CALLER