summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--frm/testsuite/frm/test.exp9
-rw-r--r--from/testsuite/from/test.exp3
-rw-r--r--imap4d/testsuite/imap4d/examine.exp8
-rw-r--r--imap4d/testsuite/imap4d/expunge.exp11
-rw-r--r--imap4d/testsuite/imap4d/fetch.exp25
-rw-r--r--mail/testsuite/mail/folder.exp2
-rw-r--r--mail/testsuite/mail/write.exp10
-rw-r--r--mailbox/testsuite/Mime46
-rw-r--r--messages/testsuite/messages/test.exp4
-rw-r--r--readmsg/testsuite/readmsg/test.exp19
-rw-r--r--sieve/testsuite/sieve/header.exp3
11 files changed, 103 insertions, 37 deletions
diff --git a/frm/testsuite/frm/test.exp b/frm/testsuite/frm/test.exp
index 21eba2fc2..6bdd7d20a 100644
--- a/frm/testsuite/frm/test.exp
+++ b/frm/testsuite/frm/test.exp
@@ -27,22 +27,25 @@ mu_prepare_spools
mu_exec -retcode 1 -message "frm" "Foo Bar\tJabberwocky"\
"Bar\tRe: Jabberwocky"\
"Sergey Poznyakoff\tSimple MIME"\
-"Sergey Poznyakoff\tNested MIME"
+"Sergey Poznyakoff\tNested MIME"\
+"Sergey Poznyakoff\tEmpty MIME Parts"
mu_exec -retcode 1 -message "frm -n" -arg -n \
"1: Foo Bar\tJabberwocky"\
"2: Bar\tRe: Jabberwocky"\
"3: Sergey Poznyakoff\tSimple MIME"\
-"4: Sergey Poznyakoff\tNested MIME"
+"4: Sergey Poznyakoff\tNested MIME"\
+"5: Sergey Poznyakoff\tEmpty MIME Parts"
mu_exec -retcode 1 -message "frm -l" -arg -l \
"(Bar) Foo Bar\tJabberwocky"\
"(Foo Bar) Bar\tRe: Jabberwocky"\
"(Foo Bar) Sergey Poznyakoff\tSimple MIME"\
"(Foo Bar) Sergey Poznyakoff\tNested MIME"\
+"(Foo Bar) Sergey Poznyakoff\tEmpty MIME Parts"
mu_exec -retcode 1 -message "frm -qS" -arg -qS \
-"You have 4 messages"
+"You have 5 messages"
mu_exec -retcode 1 -arg %mbox -message "frm %mbox" \
"Sergey Poznyakoff\tMBOX"
diff --git a/from/testsuite/from/test.exp b/from/testsuite/from/test.exp
index 0a0dc7e72..e31726f26 100644
--- a/from/testsuite/from/test.exp
+++ b/from/testsuite/from/test.exp
@@ -28,7 +28,8 @@ mu_exec -message "from" \
"Foo Bar\tJabberwocky"\
"Bar\tRe: Jabberwocky"\
"Sergey Poznyakoff\tSimple MIME"\
-"Sergey Poznyakoff\tNested MIME"
+"Sergey Poznyakoff\tNested MIME"\
+"Sergey Poznyakoff\tEmpty MIME Parts"
mu_exec -message "from mbox" -arg %mbox \
"Sergey Poznyakoff\tMBOX"
diff --git a/imap4d/testsuite/imap4d/examine.exp b/imap4d/testsuite/imap4d/examine.exp
index e454e3744..2a693cf9c 100644
--- a/imap4d/testsuite/imap4d/examine.exp
+++ b/imap4d/testsuite/imap4d/examine.exp
@@ -43,14 +43,14 @@ imap4d_test "STATUS INBOX (MESSAGES RECENT UNSEEN UIDVALIDITY UIDNEXT)" \
"OK"
imap4d_test "STATUS mbox1 (MESSAGES RECENT UNSEEN UIDNEXT)" \
-"STATUS mbox1 (MESSAGES 4 RECENT 4 UNSEEN 4 UIDNEXT 5 )" \
+"STATUS mbox1 (MESSAGES 5 RECENT 5 UNSEEN 5 UIDNEXT 6 )" \
"OK"
imap4d_test "EXAMINE mbox1" \
-"4 EXISTS"\
-"4 RECENT"\
+"5 EXISTS"\
+"5 RECENT"\
-re {OK \[UIDVALIDITY [0-9]+\] UID valididy status}\
-"OK \[UIDNEXT 5\] Predicted next uid"\
+"OK \[UIDNEXT 6\] Predicted next uid"\
"OK \[UNSEEN 1\] first unseen messsage"\
"FLAGS (\\Answered \\Flagged \\Deleted \\Seen \\Draft)"\
"OK \[PERMANENTFLAGS ()\] No Permanent flags"\
diff --git a/imap4d/testsuite/imap4d/expunge.exp b/imap4d/testsuite/imap4d/expunge.exp
index 82e24a8b9..f26cd74c7 100644
--- a/imap4d/testsuite/imap4d/expunge.exp
+++ b/imap4d/testsuite/imap4d/expunge.exp
@@ -33,10 +33,10 @@ imap4d_start
imap4d_auth "user!passwd" "guessme"
imap4d_test "SELECT mbox1" \
-"4 EXISTS"\
-"4 RECENT"\
+"5 EXISTS"\
+"5 RECENT"\
-re {OK \[UIDVALIDITY [0-9]+\] UID valididy status}\
-"OK \[UIDNEXT 5\] Predicted next uid"\
+"OK \[UIDNEXT 6\] Predicted next uid"\
"OK \[UNSEEN 1\] first unseen messsage"\
"FLAGS (\\Answered \\Flagged \\Deleted \\Seen \\Draft)"\
"OK \[PERMANENTFLAGS (\\Answered \\Deleted \\Seen)\] Permanent flags" \
@@ -46,12 +46,14 @@ imap4d_test "STORE 2:* +FLAGS (\\Deleted)"\
"2 FETCH (FLAGS (\\Deleted \\Recent))"\
"3 FETCH (FLAGS (\\Deleted \\Recent))"\
"4 FETCH (FLAGS (\\Deleted \\Recent))"\
+"5 FETCH (FLAGS (\\Deleted \\Recent))"\
"OK"
imap4d_test "EXPUNGE"\
"2 EXPUNGED"\
"2 EXPUNGED"\
"2 EXPUNGED"\
+"2 EXPUNGED"\
"1 EXISTS"\
"1 RECENT"\
"OK"
@@ -60,8 +62,9 @@ imap4d_test "CLOSE"
imap4d_test "SELECT mbox1" \
"1 EXISTS"\
+"0 RECENT"\
-re {OK \[UIDVALIDITY [0-9]+\] UID valididy status}\
-"OK \[UIDNEXT 5\] Predicted next uid"\
+"OK \[UIDNEXT 6\] Predicted next uid"\
"OK \[UNSEEN 1\] first unseen messsage"\
"FLAGS (\\Answered \\Flagged \\Deleted \\Seen \\Draft)"\
"OK \[PERMANENTFLAGS (\\Answered \\Deleted \\Seen)\] Permanent flags" \
diff --git a/imap4d/testsuite/imap4d/fetch.exp b/imap4d/testsuite/imap4d/fetch.exp
index 06ad8b578..63d4fc8f3 100644
--- a/imap4d/testsuite/imap4d/fetch.exp
+++ b/imap4d/testsuite/imap4d/fetch.exp
@@ -32,10 +32,10 @@ imap4d_start
imap4d_auth "user!passwd" "guessme"
imap4d_test "SELECT mbox1" \
-"4 EXISTS"\
-"4 RECENT"\
+"5 EXISTS"\
+"5 RECENT"\
-re {OK \[UIDVALIDITY [0-9]+\] UID valididy status}\
-"OK \[UIDNEXT 5\] Predicted next uid"\
+"OK \[UIDNEXT 6\] Predicted next uid"\
"OK \[UNSEEN 1\] first unseen messsage"\
"FLAGS (\\Answered \\Flagged \\Deleted \\Seen \\Draft)"\
"OK \[PERMANENTFLAGS (\\Answered \\Deleted \\Seen)\] Permanent flags" \
@@ -70,6 +70,7 @@ imap4d_test "FETCH 1:* ENVELOPE"\
"2 FETCH (ENVELOPE (\"Fri, 28 Dec 2001 23:28:08 +0200\" \"Re: Jabberwocky\" ((\"Bar\" NIL \"bar\" \"dontmailme.org\")) ((\"Bar\" NIL \"bar\" \"dontmailme.org\")) ((\"Bar\" NIL \"bar\" \"dontmailme.org\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) NIL NIL NIL \"<200112232808.fERKR9N16790@dontmailme.org>\"))"\
"3 FETCH (ENVELOPE (\"Sat, 13 Jul 2002 00:43:18 +0300\" \"Simple MIME\" ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) NIL NIL NIL \"<200207122143.g6CLhIb05086@Mirddin.farlep.net>\"))"\
"4 FETCH (ENVELOPE (\"Sat, 13 Jul 2002 00:50:58 +0300\" \"Nested MIME\" ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) NIL NIL NIL \"<200207122150.g6CLowb05126@Mirddin.farlep.net>\"))"\
+"5 FETCH (ENVELOPE (\"Sat, 13 Jul 2002 00:43:18 +0300\" \"Empty MIME Parts\" ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) NIL NIL NIL \"<200207122143.g6CLhIb05086@Mirddin.farlep.net>\"))"\
"OK"
# ALL Macro equivalent to: (FLAGS INTERNALDATE
@@ -80,6 +81,7 @@ imap4d_test "FETCH 1:\* ALL"\
"2 FETCH (FLAGS (\\Recent) INTERNALDATE \"28-Dec-2001 23:28:09 +0000\" RFC822.SIZE 548 ENVELOPE (\"Fri, 28 Dec 2001 23:28:08 +0200\" \"Re: Jabberwocky\" ((\"Bar\" NIL \"bar\" \"dontmailme.org\")) ((\"Bar\" NIL \"bar\" \"dontmailme.org\")) ((\"Bar\" NIL \"bar\" \"dontmailme.org\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) NIL NIL NIL \"<200112232808.fERKR9N16790@dontmailme.org>\"))"\
"3 FETCH (FLAGS (\\Recent) INTERNALDATE \"13-Jul-2002 00:43:18 +0000\" RFC822.SIZE 1668 ENVELOPE (\"Sat, 13 Jul 2002 00:43:18 +0300\" \"Simple MIME\" ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) NIL NIL NIL \"<200207122143.g6CLhIb05086@Mirddin.farlep.net>\"))"\
"4 FETCH (FLAGS (\\Recent) INTERNALDATE \"13-Jul-2002 00:50:58 +0000\" RFC822.SIZE 3568 ENVELOPE (\"Sat, 13 Jul 2002 00:50:58 +0300\" \"Nested MIME\" ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) NIL NIL NIL \"<200207122150.g6CLowb05126@Mirddin.farlep.net>\"))"\
+"5 FETCH (FLAGS (\\Recent) INTERNALDATE \"13-Jul-2002 00:43:18 +0000\" RFC822.SIZE 937 ENVELOPE (\"Sat, 13 Jul 2002 00:43:18 +0300\" \"Empty MIME Parts\" ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Sergey Poznyakoff\" NIL \"gray\" \"Mirddin.farlep.net\")) ((\"Foo Bar\" NIL \"foobar\" \"nonexistent.net\")) NIL NIL NIL \"<200207122143.g6CLhIb05086@Mirddin.farlep.net>\"))"\
"OK"
# BODYSTRUCTURE The [MIME-IMB] body structure of the message. This
@@ -103,12 +105,17 @@ imap4d_test "FETCH 4 BODYSTRUCTURE"\
"4 FETCH (BODYSTRUCTURE ((\"text\" \"plain\" (\"name\" \"msg.21\" \"charset\" \"us-ascii\") \"<5122.1026510654.2@Mirddin.farlep.net>\" \"Father William Part I\" \"7BIT\" 353 11 NIL NIL NIL)((\"application\" \"octet-stream\" (\"name\" \"msg.22\") \"<5122.1026510654.4@Mirddin.farlep.net>\" \"Father William Part II\" \"base64\" 488 NIL NIL NIL)((\"application\" \"octet-stream\" (\"name\" \"msg.23\") \"<5122.1026510654.6@Mirddin.farlep.net>\" \"Father William Part III\" \"base64\" 492 NIL NIL NIL)(\"application\" \"octet-stream\" (\"name\" \"msg.24\") \"<5122.1026510654.7@Mirddin.farlep.net>\" \"Father William Part IV\" \"base64\" 504 NIL NIL NIL) \"mixed\" (\"boundary\" \"----- =_aaaaaaaaaa2\") NIL NIL) \"mixed\" (\"boundary\" \"----- =_aaaaaaaaaa1\") NIL NIL) \"mixed\" (\"boundary\" \"----- =_aaaaaaaaaa0\") NIL NIL))"\
"OK"
+imap4d_test "FETCH 5 BODYSTRUCTURE"\
+"5 FETCH (BODYSTRUCTURE ((\"text\" \"plain\" (\"name\" \"empty\" \"charset\" \"us-ascii\") \"<5082.1026510189.1@Mirddin.farlep.net>\" \"Empty part\" \"7BIT\" 0 0 NIL NIL NIL)(\"text\" \"plain\" (\"name\" \"single.line\" \"charset\" \"\us-ascii\") \"<5082.1026510189.2@Mirddin.farlep.net>\" \"Single line part\" \"7BIT\" 2 1 NIL NIL NIL) \"mixed\" (\"boundary\" \"----- =_aaaaaaaaaa0\") NIL NIL))"\
+"OK"
+
# BODY The text of a particular body section.
imap4d_test "FETCH 1:* BODY"\
"1 FETCH (BODY (\"TEXT\" \"PLAIN\" (\"CHARSET\" \"US-ASCII\") NIL NIL \"7BIT\" 972 35))"\
"2 FETCH (BODY (\"TEXT\" \"PLAIN\" (\"CHARSET\" \"US-ASCII\") NIL NIL \"7BIT\" 219 4))"\
"3 FETCH (BODY ((\"text\" \"plain\" (\"name\" \"msg.1\" \"charset\" \"us-ascii\") \"<5082.1026510189.1@Mirddin.farlep.net>\" \"How doth\" \"7BIT\" 241 10)(\"application\" \"octet-stream\" (\"name\" \"msg.21\") \"<5082.1026510189.2@Mirddin.farlep.net>\" \"Father William Part I\" \"base64\" 470) \"mixed\" NIL NIL NIL))"\
"4 FETCH (BODY ((\"text\" \"plain\" (\"name\" \"msg.21\" \"charset\" \"us-ascii\") \"<5122.1026510654.2@Mirddin.farlep.net>\" \"Father William Part I\" \"7BIT\" 353 11)((\"application\" \"octet-stream\" (\"name\" \"msg.22\") \"<5122.1026510654.4@Mirddin.farlep.net>\" \"Father William Part II\" \"base64\" 488)((\"application\" \"octet-stream\" (\"name\" \"msg.23\") \"<5122.1026510654.6@Mirddin.farlep.net>\" \"Father William Part III\" \"base64\" 492)(\"application\" \"octet-stream\" (\"name\" \"msg.24\") \"<5122.1026510654.7@Mirddin.farlep.net>\" \"Father William Part IV\" \"base64\" 504) \"mixed\" NIL NIL NIL) \"mixed\" NIL NIL NIL) \"mixed\" NIL NIL NIL))"\
+"5 FETCH (BODY ((\"text\" \"plain\" (\"name\" \"empty\" \"charset\" \"us-ascii\") \"<5082.1026510189.1@Mirddin.farlep.net>\" \"Empty part\" \"7BIT\" 0 0)(\"text\" \"plain\" (\"name\" \"single.line\" \"charset\" \"\us-ascii\") \"<5082.1026510189.2@Mirddin.farlep.net>\" \"Single line part\" \"7BIT\" 2 1) \"mixed\" NIL NIL NIL))"\
"OK"
# BODY.PEEK[<section>]<<partial>>
@@ -386,6 +393,17 @@ imap4d_test "FETCH 4 BODY\[2.2.TEXT\]"\
")"\
"OK"
+imap4d_test "FETCH 5 BODY\[1.TEXT\]"\
+"5 FETCH (FLAGS (\\Seen) BODY\[1.TEXT\] \"\")"\
+"OK"
+
+imap4d_test "FETCH 5 BODY\[2.TEXT\]"\
+"5 FETCH (BODY\[2.TEXT\] {2}"\
+-literal\
+""\
+")"\
+"OK"
+
###############
# Test RFC822 operations
@@ -396,6 +414,7 @@ imap4d_test "STORE 1:* -FLAGS (\\Seen)"\
"2 FETCH (FLAGS (\\Recent))"\
"3 FETCH (FLAGS (\\Recent))"\
"4 FETCH (FLAGS (\\Recent))"\
+"5 FETCH (FLAGS (\\Recent))"\
"OK"
# RFC822 Functionally equivalent to BODY[], differing in the
diff --git a/mail/testsuite/mail/folder.exp b/mail/testsuite/mail/folder.exp
index 9ec028357..a52c56c62 100644
--- a/mail/testsuite/mail/folder.exp
+++ b/mail/testsuite/mail/folder.exp
@@ -26,7 +26,7 @@ mail_command "set folder=\"$MU_FOLDER_DIR\""
mail_test "folders" -re "one.*two"
mail_test "file +one" \
- "Held 4 messages in $MU_SPOOL_DIR/mbox1"
+ "Held 5 messages in $MU_SPOOL_DIR/mbox1"
mail_test "sum" \
"\"$MU_FOLDER_DIR/one\": 1 message 1 new"
mail_test "headers" \
diff --git a/mail/testsuite/mail/write.exp b/mail/testsuite/mail/write.exp
index 5f5f66872..4d387c357 100644
--- a/mail/testsuite/mail/write.exp
+++ b/mail/testsuite/mail/write.exp
@@ -21,24 +21,26 @@ mail_start "--file=%mbox1"
# Delete first and last message and quit
mail_command "delete 1 4"
mail_test -noprompt "quit" \
- "Held 2 messages in $MU_SPOOL_DIR/mbox1"
+ "Held 3 messages in $MU_SPOOL_DIR/mbox1"
# Start again using the same mailbox
mail_start -reuse-spool "--file=%mbox1"
mail_test "h" \
">U 1 Bar Fri Dec 28 23:28 16/579 Re: Jabberwocky"\
- " U 2 Sergey Poznyakoff Sat Jul 13 00:43 44/1645 Simple MIME"
+ " U 2 Sergey Poznyakoff Sat Jul 13 00:43 44/1645 Simple MIME"\
+ " U 3 Sergey Poznyakoff Sat Jul 13 00:43 27/931 Empty MIME Parts"
# Send first message to mbox...
mail_command "mbox 1"
mail_test "h" \
">M 1 Bar Fri Dec 28 23:28 16/579 Re: Jabberwocky"\
- " U 2 Sergey Poznyakoff Sat Jul 13 00:43 44/1645 Simple MIME"
+ " U 2 Sergey Poznyakoff Sat Jul 13 00:43 44/1645 Simple MIME"\
+ " U 3 Sergey Poznyakoff Sat Jul 13 00:43 27/931 Empty MIME Parts"
# ... and quit
mail_test -noprompt "quit" \
"Saved 1 message in $MU_SPOOL_DIR/mbox" \
- "Held 1 message in $MU_SPOOL_DIR/mbox1"
+ "Held 2 messages in $MU_SPOOL_DIR/mbox1"
# Now check the mbox contents
mail_start -reuse-spool "--file=%mbox"
diff --git a/mailbox/testsuite/Mime b/mailbox/testsuite/Mime
index 3ed59a584..ee295acf4 100644
--- a/mailbox/testsuite/Mime
+++ b/mailbox/testsuite/Mime
@@ -21,9 +21,9 @@ Message: 1
From: Foo Bar <foobar@nonexistent.net>
Subject: Jabberwocky
Number of parts in message - 1
-Total message size - 1255
+Total message size - 1255/44
Type of part 1 =
-Message part size - 1255
+Message part size - 1255/44
Text Message
Begin
`Twas brillig, and the slithy toves
@@ -67,9 +67,9 @@ Message: 2
From: Bar <bar@dontmailme.org>
Subject: Re: Jabberwocky
Number of parts in message - 1
-Total message size - 535
+Total message size - 535/13
Type of part 1 =
-Message part size - 535
+Message part size - 535/13
Text Message
Begin
It seems very pretty, but it's *rather* hard to understand!'
@@ -82,9 +82,9 @@ Message: 3
From: Sergey Poznyakoff <gray@Mirddin.farlep.net>
Subject: Simple MIME
Number of parts in message - 2
-Total message size - 1626
+Total message size - 1626/42
Type of part 1 = text/plain; name="msg.1"; charset="us-ascii"
-Message part size - 372
+Message part size - 372/14
Text Message
Begin
How doth the little crocodile
@@ -100,7 +100,7 @@ With gently smiling jaws!
End
Type of part 2 = application/octet-stream; name="msg.21"
-Message part size - 646
+Message part size - 646/12
Attachment - saving [msg.21]
Begin
`You are old, Father William,' the young man said,
@@ -119,9 +119,9 @@ Message: 4
From: Sergey Poznyakoff <gray@Mirddin.farlep.net>
Subject: Nested MIME
Number of parts in message - 2
-Total message size - 3484
+Total message size - 3484/84
Type of part 1 = text/plain; name="msg.21"; charset="us-ascii"
-Message part size - 497
+Message part size - 497/15
Text Message
Begin
`You are old, Father William,' the young man said,
@@ -138,11 +138,11 @@ Why, I do it again and again.'
End
Type of part 2 = multipart/mixed; boundary="----- =_aaaaaaaaaa1"
-Message part size - 2379
+Message part size - 2379/53
Encapsulated message :
Begin
Type of part 1 = application/octet-stream; name="msg.22"
-Message part size - 664
+Message part size - 664/13
Attachment - saving [msg.22]
Begin
`You are old,' said the youth, `as I mentioned before,
@@ -157,11 +157,11 @@ Allow me to sell you a couple?'
End
Type of part 2 = multipart/mixed; boundary="----- =_aaaaaaaaaa2"
-Message part size - 1532
+Message part size - 1532/33
Encapsulated message :
Begin
Type of part 1 = application/octet-stream; name="msg.23"
-Message part size - 669
+Message part size - 669/13
Attachment - saving [msg.23]
Begin
`You are old,' said the youth, `and your jaws are too weak
@@ -176,7 +176,7 @@ Has lasted the rest of my life.'
End
Type of part 2 = application/octet-stream; name="msg.24"
-Message part size - 680
+Message part size - 680/13
Attachment - saving [msg.24]
Begin
`You are old,' said the youth, `one would hardly suppose
@@ -194,3 +194,21 @@ End
End
End
+Message: 5
+From: Sergey Poznyakoff <gray@Mirddin.farlep.net>
+Subject: Empty MIME Parts
+Number of parts in message - 2
+Total message size - 912/25
+Type of part 1 = text/plain; name="empty"; charset="us-ascii
+Message part size - 143/4
+Text Message
+Begin
+
+End
+Type of part 2 = text/plain; name="single.line"; charset="us-ascii
+Message part size - 156/5
+Text Message
+Begin
+
+
+End
diff --git a/messages/testsuite/messages/test.exp b/messages/testsuite/messages/test.exp
index a881e2f15..5b951ddf2 100644
--- a/messages/testsuite/messages/test.exp
+++ b/messages/testsuite/messages/test.exp
@@ -25,9 +25,9 @@ set env(FOLDER) $env(MAIL)
mu_prepare_spools
mu_exec -message "messages" \
-"Number of messages in $MU_SPOOL_DIR/mbox1: 4"
+"Number of messages in $MU_SPOOL_DIR/mbox1: 5"
-mu_exec -message "messages -q" -arg -q "4"
+mu_exec -message "messages -q" -arg -q "5"
mu_exec -message "messages %teaparty.mbox" -arg %teaparty.mbox \
"Number of messages in $MU_SPOOL_DIR/teaparty.mbox: 95"
diff --git a/readmsg/testsuite/readmsg/test.exp b/readmsg/testsuite/readmsg/test.exp
index e2cea3634..75ab693ab 100644
--- a/readmsg/testsuite/readmsg/test.exp
+++ b/readmsg/testsuite/readmsg/test.exp
@@ -188,8 +188,27 @@ mu_exec -message "readmsg *" -arg "\\\\*" \
""\
-- "------- =_aaaaaaaaaa0--"\
""\
+"To: Foo Bar <foobar@nonexistent.net>"\
+"Subject: Empty MIME Parts"\
+"Date: Sat, 13 Jul 2002 00:43:18 +0300"\
+"From: Sergey Poznyakoff <gray@Mirddin.farlep.net>"\
+""\
+-- "------- =_aaaaaaaaaa0"\
+"Content-Type: text/plain; name=\"empty\"; charset=\"us-ascii\""\
+"Content-ID: <5082.1026510189.1@Mirddin.farlep.net>"\
+"Content-Description: Empty part"\
+""\
+-- "------- =_aaaaaaaaaa0"\
+"Content-Type: text/plain; name=\"single.line\"; charset=\"us-ascii\""\
+"Content-ID: <5082.1026510189.2@Mirddin.farlep.net>"\
+"Content-Description: Single line part"\
+""\
+""\
+-- "------- =_aaaaaaaaaa0--"\
+""\
""
+
mu_exec -message "readmsg 1 2" -arg 1 -arg 2 \
"Date: Fri, 28 Dec 2001 22:18:08 +0200"\
"From: Foo Bar <foobar@nonexistent.net>"\
diff --git a/sieve/testsuite/sieve/header.exp b/sieve/testsuite/sieve/header.exp
index 1581ddc87..57c560536 100644
--- a/sieve/testsuite/sieve/header.exp
+++ b/sieve/testsuite/sieve/header.exp
@@ -35,6 +35,7 @@ sieve_test -f "$MU_SPOOL_DIR/mbox1" header-mime.sv -pattern \
"IMPLICIT KEEP on msg uid 1"\
"IMPLICIT KEEP on msg uid 2"\
"DISCARD on msg uid 3: marking as deleted"\
- "IMPLICIT KEEP on msg uid 4"
+ "IMPLICIT KEEP on msg uid 4"\
+ "IMPLICIT KEEP on msg uid 5"
# end of header.exp

Return to:

Send suggestions and report system problems to the System administrator.