From 328c5688dbe0f4c14418f22350ccd99b3fe8ac71 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Fri, 28 Apr 2017 23:54:35 +0100 Subject: Support wire-format spoolfiles --- test/stderr/0143 | 1 + test/stderr/0169 | 1 + test/stderr/0275 | 1 - test/stderr/0386 | 2 ++ test/stderr/0393 | 3 +++ test/stderr/0402 | 2 ++ test/stderr/0404 | 1 + test/stderr/0408 | 1 + test/stderr/0476 | 1 + test/stderr/0487 | 1 + test/stderr/0512 | 2 ++ test/stderr/2600 | 1 + test/stderr/4520 | 6 +++--- test/stderr/5004 | 1 + test/stderr/5005 | 2 ++ test/stderr/5006 | 1 + test/stderr/5008 | 2 ++ 17 files changed, 25 insertions(+), 4 deletions(-) (limited to 'test/stderr') diff --git a/test/stderr/0143 b/test/stderr/0143 index 3de426629..b1d0ff9b6 100644 --- a/test/stderr/0143 +++ b/test/stderr/0143 @@ -38,6 +38,7 @@ cmd buf flush ddd bytes cmd buf flush ddd bytes SMTP<< 354 Send data SMTP>> writing message and terminating "." +cannot use sendfile for body: spoolfile not wireformat 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 diff --git a/test/stderr/0169 b/test/stderr/0169 index 70f11bf4f..30ed85f8d 100644 --- a/test/stderr/0169 +++ b/test/stderr/0169 @@ -24,6 +24,7 @@ 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=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 quota = 52428800 threshold = 21495808 old size = sssss message size = sss diff --git a/test/stderr/0275 b/test/stderr/0275 index 3ec0da1d4..5f76af09a 100644 --- a/test/stderr/0275 +++ b/test/stderr/0275 @@ -163,7 +163,6 @@ LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss created log directory TESTSUITE/spool/log search_tidyup called -release cutthrough conn: msg passed for delivery exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xfbb95cfd -odi -Mc 10HmaX-0005vi-00 Exim version x.yz .... changed uid/gid: forcing real = effective diff --git a/test/stderr/0386 b/test/stderr/0386 index 44e856da2..6fb8a5536 100644 --- a/test/stderr/0386 +++ b/test/stderr/0386 @@ -310,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 +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 @@ -490,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 +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 diff --git a/test/stderr/0393 b/test/stderr/0393 index dd0887f09..7fb82e35c 100644 --- a/test/stderr/0393 +++ b/test/stderr/0393 @@ -28,6 +28,7 @@ mailbox TESTSUITE/test-mail/userx is locked writing to file TESTSUITE/test-mail/userx writing data block fd=dddd size=sss timeout=0 process pppp running as transport filter: fd_write=dddd fd_read=dddd +cannot use sendfile for body: spoolfile not wireformat writing data block fd=dddd size=sss timeout=0 process pppp writing to transport filter copying from the filter @@ -70,6 +71,7 @@ lock file created mailbox TESTSUITE/test-mail/userx is locked writing to file TESTSUITE/test-mail/userx 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 @@ -108,6 +110,7 @@ lock file created mailbox TESTSUITE/test-mail/userx is locked writing to file TESTSUITE/test-mail/userx 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 diff --git a/test/stderr/0402 b/test/stderr/0402 index a007de31c..7f301651b 100644 --- a/test/stderr/0402 +++ b/test/stderr/0402 @@ -487,6 +487,7 @@ writing to file TESTSUITE/test-mail/junk └─────result: From CALLER@test.ex Tue Mar 02 09:44:33 1999 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 @@ -542,6 +543,7 @@ writing to file TESTSUITE/test-mail/junk └─────result: From CALLER@test.ex Tue Mar 02 09:44:33 1999 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 diff --git a/test/stderr/0404 b/test/stderr/0404 index d3d8f4c64..3b7605ba7 100644 --- a/test/stderr/0404 +++ b/test/stderr/0404 @@ -18004,6 +18004,7 @@ writing to file TESTSUITE/test-mail/sender writing data block fd=dddd size=sss timeout=0 flushing headers buffer 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 diff --git a/test/stderr/0408 b/test/stderr/0408 index f3d6d6b1a..9cdb41d96 100644 --- a/test/stderr/0408 +++ b/test/stderr/0408 @@ -159,6 +159,7 @@ lock file created mailbox TESTSUITE/test-mail/userx is locked writing to file TESTSUITE/test-mail/userx 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 diff --git a/test/stderr/0476 b/test/stderr/0476 index 59ea69f58..675c6239c 100644 --- a/test/stderr/0476 +++ b/test/stderr/0476 @@ -52,6 +52,7 @@ set_process_info: pppp delivering 10HmaX-0005vi-00 LOG: MAIN ** userx@test.ex R=r1 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:: 550 NO set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00 +cannot use sendfile for body: spoolfile not wireformat writing data block fd=dddd size=sss timeout=0 Exim version x.yz .... configuration file is TESTSUITE/test-config diff --git a/test/stderr/0487 b/test/stderr/0487 index 7319b67dd..70da61fff 100644 --- a/test/stderr/0487 +++ b/test/stderr/0487 @@ -163,6 +163,7 @@ writing to file TESTSUITE/test-mail/userx writing data block fd=dddd size=sss timeout=0 rewrite_one_header: type=F: From: unqualified +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 diff --git a/test/stderr/0512 b/test/stderr/0512 index 1cdf5f013..07025d5d7 100644 --- a/test/stderr/0512 +++ b/test/stderr/0512 @@ -59,6 +59,7 @@ LOG: MAIN == userx@myhost.test.ex R=r1 T=t1 defer (dd): Connection refused LOG: MAIN ** userx@myhost.test.ex: retry timeout exceeded +cannot use sendfile for body: spoolfile not wireformat writing data block fd=dddd size=sss timeout=0 Exim version x.yz .... configuration file is TESTSUITE/test-config @@ -122,6 +123,7 @@ LOG: MAIN == userx@myhost.test.ex R=r1 T=t1 defer (dd): Connection refused LOG: MAIN ** userx@myhost.test.ex: retry timeout exceeded +cannot use sendfile for body: spoolfile not wireformat writing data block fd=dddd size=sss timeout=0 Exim version x.yz .... configuration file is TESTSUITE/test-config diff --git a/test/stderr/2600 b/test/stderr/2600 index 4e9974733..599be797a 100644 --- a/test/stderr/2600 +++ b/test/stderr/2600 @@ -439,6 +439,7 @@ lock file created mailbox TESTSUITE/test-mail/userx is locked writing to file TESTSUITE/test-mail/userx 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 diff --git a/test/stderr/4520 b/test/stderr/4520 index c2a856bb1..c1bafcdcc 100644 --- a/test/stderr/4520 +++ b/test/stderr/4520 @@ -23,18 +23,18 @@ cmd buf flush ddd bytes SMTP<< 250 OK SMTP<< 250 Accepted SMTP<< 354 Enter message, ending with "." on a line by itself -PDKIM (checking verify key)<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< +PDKIM (checking verify key)>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> PDKIM >> Parsing public key record >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Raw record: v=DKIM1\;{SP}p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDXRFf+VhT+lCgFhhSkinZKcFNeRzjYdW8vT29Rbb3NadvTFwAd+cVLPFwZL8H5tUD/7JbUPqNTCPxmpgIL+V5T4tEZMorHatvvUM2qfcpQ45IfsZ+YdhbIiAslHCpy4xNxIR3zylgqRUF4+Dtsaqy3a5LhwMiKCLrnzhXk1F1hxwIDAQAB v=DKIM1\ p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDXRFf+VhT+lCgFhhSkinZKcFNeRzjYdW8vT29Rbb3NadvTFwAd+cVLPFwZL8H5tUD/7JbUPqNTCPxmpgIL+V5T4tEZMorHatvvUM2qfcpQ45IfsZ+YdhbIiAslHCpy4xNxIR3zylgqRUF4+Dtsaqy3a5LhwMiKCLrnzhXk1F1hxwIDAQAB Error while parsing public key record WARNING: bad dkim key in dns -PDKIM (finished checking verify key)<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< +PDKIM (finished checking verify key)<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< content{CR}{LF} PDKIM [test.ex] Body bytes hashed: 9 PDKIM [test.ex] Body hash computed: fc06f48221d98ad6106c3845b33a2a41152482ab9e697f736ad26db4853fa657 -PDKIM >> Header data for hash, canonicalized, in sequence >>>>>>>>>>>>>> +PDKIM >> Header data for hash, canonicalized, in sequence >>>>>>>>>>>> sender:CALLER_NAME{SP}{CR}{LF} message-id:{CR}{LF} from:nobody@example.com{CR}{LF} diff --git a/test/stderr/5004 b/test/stderr/5004 index ad5c9b331..bedf5be2e 100644 --- a/test/stderr/5004 +++ b/test/stderr/5004 @@ -155,6 +155,7 @@ created directory TESTSUITE/test-mail/new created directory TESTSUITE/test-mail/cur delivering in maildir format in TESTSUITE/test-mail writing to tmp/MAILDIR.mail.test.ex +cannot use sendfile for body: spoolfile not wireformat writing data block fd=dddd size=sss timeout=0 renaming temporary file renamed tmp/MAILDIR.mail.test.ex as new/MAILDIR.mail.test.ex diff --git a/test/stderr/5005 b/test/stderr/5005 index 8b28b7055..a68bc11c9 100644 --- a/test/stderr/5005 +++ b/test/stderr/5005 @@ -149,6 +149,7 @@ delivering in maildir format in TESTSUITE/test-mail/nofile writing to tmp/MAILDIR.myhost.test.ex Exim quota = 500 old size = sssss this message = sss (included) file count quota = 0 count = 0 +cannot use sendfile for body: spoolfile not wireformat writing data block fd=dddd size=sss timeout=0 added 'ddd 1' to maildirsize file renaming temporary file @@ -338,6 +339,7 @@ delivering in maildir format in TESTSUITE/test-mail/userx writing to tmp/MAILDIR.myhost.test.ex Exim quota = 500 old size = sssss this message = sss (included) file count quota = 0 count = 0 +cannot use sendfile for body: spoolfile not wireformat writing data block fd=dddd size=sss timeout=0 added 'ddd 1' to maildirsize file renaming temporary file diff --git a/test/stderr/5006 b/test/stderr/5006 index dce0d0050..771f5fd56 100644 --- a/test/stderr/5006 +++ b/test/stderr/5006 @@ -147,6 +147,7 @@ maildir_compute_size (timestamp_only): ddddddd returning maildir size=sss filecount=0 delivering in maildir format in TESTSUITE/test-mail/userx writing to tmp/MAILDIR.myhost.test.ex +cannot use sendfile for body: spoolfile not wireformat writing data block fd=dddd size=sss timeout=0 added 'ddd 1' to maildirsize file renaming temporary file diff --git a/test/stderr/5008 b/test/stderr/5008 index fd4ae87ec..b3bf8f785 100644 --- a/test/stderr/5008 +++ b/test/stderr/5008 @@ -25,6 +25,7 @@ delivering in maildir format in TESTSUITE/test-mail/userx writing to tmp/MAILDIR.myhost.test.ex Exim quota = 1048576 old size = sssss this message = sss (included) file count quota = 0 count = -1 +cannot use sendfile for body: spoolfile not wireformat writing data block fd=dddd size=sss timeout=0 renaming temporary file renamed tmp/MAILDIR.myhost.test.ex as new/MAILDIR.myhost.test.ex @@ -64,6 +65,7 @@ delivering in maildir format in TESTSUITE/test-mail/userx writing to tmp/MAILDIR.myhost.test.ex Exim quota = 1048576 old size = sssss this message = sss (included) file count quota = 20 count = 4 +cannot use sendfile for body: spoolfile not wireformat writing data block fd=dddd size=sss timeout=0 renaming temporary file renamed tmp/MAILDIR.myhost.test.ex as new/MAILDIR.myhost.test.ex -- cgit v1.2.3