X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/4c3830a96cdc7f17576d986d440a08ead54bee7a..80ec106609b472cffc2cf0d8ed4044b7f94da1fa:/test/mhmail/test-mhmail diff --git a/test/mhmail/test-mhmail b/test/mhmail/test-mhmail index 422c647d..c773c041 100755 --- a/test/mhmail/test-mhmail +++ b/test/mhmail/test-mhmail @@ -14,39 +14,36 @@ fi . "${srcdir}/test/post/test-post-common.sh" +# Find MIME type string, using mimetypeproc if configured with it. +MIMETYPEPROC=`mhparam mimetypeproc` +content_type_string() { + if test -z "$MIMETYPEPROC"; then + echo "text/plain; name=\"`basename $1`\"; charset=\"us-ascii\"" + else + # 1) Excise leading filename followed by : and any whitespace. + # 2) Wrap charset value in double quotes. Assume that it isn't already. + printf "%s %s%s" \ + `$MIMETYPEPROC $1 | sed -e 's/.*: *//' -e 's/\(charset=\)\(.*\)/\1"\2"/'`\ + "; name=\"`basename $1`\"" + fi +} + # Customize test_post () for use with mhmail. # $1 is expected output file, provided by caller # $2 is mhmail switches, except for -body # $3 of -b signifies use -body switch, | signifies provide body on stdin -# $4 contains message body. When using stdin, can contain printf(1) format -# specifiers. +# $4 contains the message body. test_mhmail () { - "${MH_OBJ_DIR}/test/fakesmtp" "$actual" $localport & - pid="$!" - - # The server doesn't always come up fast enough, so sleep and - # retry a few times if it fails... - status=1 - for i in 0 1 2 3 4 5 6 7 8 9; do - if [ $3 = '|' ]; then - if printf "$4" | mhmail recipient@example.com $2 \ - -server 127.0.0.1 -port $localport; then - status=0 - break - fi - else - if mhmail recipient@example.com $2 -body "$4" \ - -server 127.0.0.1 -port $localport; then - status=0 - break - fi - fi - sleep 1 - done - [ $status -eq 0 ] || exit 1 - - wait ${pid} + pid=`"${MH_OBJ_DIR}/test/fakesmtp" "$actual" $localport` + + if [ $3 = '|' ]; then + printf '%s' "$4" | mhmail recipient@example.com $2 \ + -server 127.0.0.1 -port $localport + else + mhmail recipient@example.com $2 -body "$4" \ + -server 127.0.0.1 -port $localport + fi # # It's hard to calculate the exact Date: header post is going to @@ -72,12 +69,13 @@ actual_err=$MH_TEST_DIR/test-mhmail$$.actual_err # check -help # Verified behavior consistent with compiled sendmail. cat >$expected <$actual 2>&1 @@ -96,33 +95,45 @@ check $expected $actual # Verified same behavior as compiled mhmail. case `mhmail -v` in mhmail\ --*) ;; - * ) echo "$0: mhmail -v generated unexpected output" 1>&2 - failed=`expr ${failed:-0} + 1`;; + * ) printf '%s: mhmail -v generated unexpected output\n' "$0" >&2 + failed=`expr ${failed:-0} + 1`;; esac - -# check with no arguments +# check for missing argument to switches that require them +for switch in attach body cc from headerfield subject to; do + run_test "mhmail recipient -$switch" \ + "mhmail: missing argument to -$switch" +done +for switch in attach body cc from headerfield subject to; do + run_test "mhmail recipient -$switch -nosend" \ + "mhmail: missing argument to -$switch" +done +for switch in attach body cc from headerfield subject to; do + run_test "mhmail recipient -$switch -server 127.0.0.1" \ + "mhmail: missing argument to -$switch" +done + + +# check with no switches # That will just run inc, which we don't want to do anything, # so tell inc to just display its version. # Verified same behavior as compiled mhmail. -printf "inc: -version\n" >> $MH +printf 'inc: -version\n' >> $MH case `mhmail` in inc\ --*) ;; - * ) echo "$0: mhmail generated unexpected output" 1>&2 + * ) echo "$0: mhmail generated unexpected output" >&2 failed=`expr ${failed:-0} + 1`;; esac # check -nosend # Not supported by compiled mhmail. -mhmail -nosend recipient@example.com -from sender@localhost \ +mhmail -nosend recipient@example.com -from sender1@localhost \ -server 127.0.0.1 -port $localport -body '' >"$actual" 2>"$actual_err" -tmpfil=`head -1 $actual | sed -e 's/://'` - cat > "$expected" < "$expected" < +MAIL FROM: RCPT TO: DATA To: recipient@example.com -From: sender@localhost +From: sender2@localhost Date: message @@ -151,7 +162,7 @@ message QUIT EOF -test_mhmail "$expected" "-from sender@localhost -nosend -send" '|' message +test_mhmail "$expected" "-from sender2@localhost -nosend -send" '|' message [ ${failed:-0} -eq 0 ] || exit ${failed:-0} @@ -159,11 +170,11 @@ test_mhmail "$expected" "-from sender@localhost -nosend -send" '|' message # Verified same behavior as compiled mhmail. cat > "$expected" < +MAIL FROM: RCPT TO: DATA To: recipient@example.com -From: sender@localhost +From: sender3@localhost Date: message @@ -171,7 +182,7 @@ message QUIT EOF -test_mhmail "$expected" "-from sender@localhost" '|' message +test_mhmail "$expected" "-from sender3@localhost" '|' message [ ${failed:-0} -eq 0 ] || exit ${failed:-0} @@ -179,11 +190,11 @@ test_mhmail "$expected" "-from sender@localhost" '|' message # Verified same behavior as compiled mhmail. cat > "$expected" < +MAIL FROM: RCPT TO: DATA To: recipient@example.com -From: sender@localhost +From: sender4@localhost Date: body @@ -191,7 +202,7 @@ body QUIT EOF -test_mhmail "$expected" "-from sender@localhost" -b body +test_mhmail "$expected" "-from sender4@localhost" -b body [ ${failed:-0} -eq 0 ] || exit ${failed:-0} @@ -199,13 +210,13 @@ test_mhmail "$expected" "-from sender@localhost" -b body # Verified same behavior as compiled mhmail. cat > "$expected" < +MAIL FROM: RCPT TO: RCPT TO: DATA To: recipient@example.com Cc: recipient2@example.com -From: sender@localhost +From: sender5@localhost Date: message @@ -214,7 +225,7 @@ QUIT EOF test_mhmail "$expected" \ - "-from sender@localhost -cc recipient2@example.com" '|' message + "-from sender5@localhost -cc recipient2@example.com" '|' message [ ${failed:-0} -eq 0 ] || exit ${failed:-0} @@ -222,7 +233,7 @@ test_mhmail "$expected" \ # Verified same behavior as compiled mhmail. cat > "$expected" < +MAIL FROM: RCPT TO: RCPT TO: RCPT TO: @@ -231,7 +242,7 @@ DATA To: recipient@example.com Cc: recipient2@example.com, recipient3@example.com, recipient4@example.com -From: sender@localhost +From: sender6@localhost Date: message @@ -240,8 +251,8 @@ QUIT EOF test_mhmail "$expected" \ - '-from sender@localhost -cc recipient2@example.com recipient3@example.com '\ -'recipient4@example.com' '|' message + '-from sender6@localhost -cc recipient2@example.com '\ +'recipient3@example.com recipient4@example.com' '|' message [ ${failed:-0} -eq 0 ] || exit ${failed:-0} @@ -249,12 +260,12 @@ test_mhmail "$expected" \ # Verified same behavior as compiled mhmail. cat > "$expected" < +MAIL FROM: RCPT TO: DATA To: recipient@example.com Subject: Test -From: sender@localhost +From: sender7@localhost Date: message @@ -262,7 +273,7 @@ message QUIT EOF -test_mhmail "$expected" '-from sender@localhost -subject Test' '|' message +test_mhmail "$expected" '-from sender7@localhost -subject Test' '|' message [ ${failed:-0} -eq 0 ] || exit ${failed:-0} @@ -271,15 +282,15 @@ test_mhmail "$expected" '-from sender@localhost -subject Test' '|' message # 2) use send(1) by added a send switch to the profile and # verifying that it gets used. # Not supported by compiled mhmail. -printf "send: -msgid\n" >> $MH +printf 'send: -msgid\n' >> $MH cat > "$expected" < +MAIL FROM: RCPT TO: DATA To: recipient@example.com -From: sender@localhost +From: sender8@localhost Date: Message-ID: @@ -288,20 +299,20 @@ message QUIT EOF -test_mhmail "$expected" '-from sender@localhost -profile' '|' message +test_mhmail "$expected" '-from sender8@localhost -profile' '|' message [ ${failed:-0} -eq 0 ] || exit ${failed:-0} -# check repeated -from and -subject arguments +# check repeated -from and -subject switches # Verified same behavior as compiled mhmail. cat > "$expected" < +MAIL FROM: RCPT TO: DATA To: recipient@example.com Subject: Subject2 -From: sender2@localhost +From: sender9@localhost Date: message @@ -309,19 +320,19 @@ message QUIT EOF -test_mhmail "$expected" '-from sender@localhost -from sender2@localhost '\ +test_mhmail "$expected" '-from sender9@localhost -from sender9@localhost '\ '-subject Subject1 -subject Subject2' -b message [ ${failed:-0} -eq 0 ] || exit ${failed:-0} -# check repeated -body arguments +# check repeated -body switches # Verified same behavior as compiled mhmail. cat > "$expected" < +MAIL FROM: RCPT TO: DATA To: recipient@example.com -From: sender@localhost +From: sender10@localhost Date: body2 @@ -329,22 +340,22 @@ body2 QUIT EOF -test_mhmail "$expected" "-from sender@localhost -body body1" -b body2 +test_mhmail "$expected" "-from sender10@localhost -body body1" -b body2 [ ${failed:-0} -eq 0 ] || exit ${failed:-0} -# check multiple -cc arguments +# check multiple -cc switches # Verified same behavior as compiled mhmail. cat > "$expected" < +MAIL FROM: RCPT TO: RCPT TO: RCPT TO: DATA To: recipient@example.com Cc: cc1@example.com, cc2@example.com -From: sender@localhost +From: sender11@localhost Date: message @@ -353,7 +364,7 @@ QUIT EOF test_mhmail "$expected" \ - '-from sender@localhost -cc cc1@example.com -cc cc2@example.com' -b message + '-from sender11@localhost -cc cc1@example.com -cc cc2@example.com' -b message [ ${failed:-0} -eq 0 ] || exit ${failed:-0} @@ -361,7 +372,7 @@ test_mhmail "$expected" \ # Verified same behavior as compiled mhmail. cat > "$expected" < +MAIL FROM: RCPT TO: RCPT TO: RCPT TO: @@ -369,7 +380,33 @@ DATA To: recipient@example.com Cc: cc1@example.com, cc2@example.com Subject: Test -From: sender@localhost +From: sender12@localhost +Date: + +message +. +QUIT +EOF + +test_mhmail "$expected" \ + '-from sender12@localhost -cc cc1@example.com -subject '\ +'Test cc2@example.com' -b message +[ ${failed:-0} -eq 0 ] || exit ${failed:-0} + + +# check -cc switch followed by -to switch +# Verified same behavior as compiled mhmail. +cat > "$expected" < +RCPT TO: +RCPT TO: +RCPT TO: +DATA +To: recipient@example.com, recipient2@example.com +Cc: cc1@example.com +Subject: Test +From: sender13@localhost Date: message @@ -378,7 +415,8 @@ QUIT EOF test_mhmail "$expected" \ - '-from sender@localhost -cc cc1@example.com -subject Test cc2@example.com' \ + "-from sender13@localhost -cc cc1@example.com -subject Test \ + -to recipient2@example.com" \ -b message [ ${failed:-0} -eq 0 ] || exit ${failed:-0} @@ -406,11 +444,11 @@ check "$expected_err" "$actual_err" # Verified same behavior as compiled mhmail. cat > "$expected" < +MAIL FROM: RCPT TO: DATA To: recipient@example.com -From: sender@localhost +From: sender14@localhost Date: @@ -418,7 +456,8 @@ Date: QUIT EOF -test_mhmail "$expected" '-from sender@localhost' '|' '\n' +test_mhmail "$expected" '-from sender14@localhost' '|' ' +' [ ${failed:-0} -eq 0 ] || exit ${failed:-0} @@ -426,11 +465,11 @@ test_mhmail "$expected" '-from sender@localhost' '|' '\n' # Verified same behavior as compiled mhmail. cat > "$expected" < +MAIL FROM: RCPT TO: DATA To: recipient@example.com -From: sender@localhost +From: sender15@localhost Date: @@ -440,7 +479,10 @@ Date: QUIT EOF -test_mhmail "$expected" '-from sender@localhost' '|' '\n\n\n' +test_mhmail "$expected" '-from sender15@localhost' '|' ' + + +' [ ${failed:-0} -eq 0 ] || exit ${failed:-0} @@ -448,11 +490,11 @@ test_mhmail "$expected" '-from sender@localhost' '|' '\n\n\n' # Verified same behavior as compiled mhmail. cat > "$expected" < +MAIL FROM: RCPT TO: DATA To: recipient@example.com -From: sender@localhost +From: sender16@localhost Date: no newline in input @@ -460,7 +502,7 @@ no newline in input QUIT EOF -test_mhmail "$expected" '-from sender@localhost' '|' 'no newline in input' +test_mhmail "$expected" '-from sender16@localhost' '|' 'no newline in input' [ ${failed:-0} -eq 0 ] || exit ${failed:-0} @@ -468,11 +510,11 @@ test_mhmail "$expected" '-from sender@localhost' '|' 'no newline in input' # Verified same behavior as compiled mhmail. cat > "$expected" < +MAIL FROM: RCPT TO: DATA To: recipient@example.com -From: sender@localhost +From: sender17@localhost Date: here's some text @@ -482,7 +524,10 @@ here's some text QUIT EOF -test_mhmail "$expected" '-from sender@localhost' '|' "here's some text\n\n\n" +test_mhmail "$expected" '-from sender17@localhost' '|' "here's some text + + +" [ ${failed:-0} -eq 0 ] || exit ${failed:-0} @@ -490,11 +535,11 @@ test_mhmail "$expected" '-from sender@localhost' '|' "here's some text\n\n\n" # Verified same behavior as compiled mhmail. cat > "$expected" < +MAIL FROM: RCPT TO: DATA To: recipient@example.com -From: sender@localhost +From: sender18@localhost Date: @@ -502,7 +547,7 @@ Date: QUIT EOF -test_mhmail "$expected" '-from sender@localhost' -b '' +test_mhmail "$expected" '-from sender18@localhost' -b '' [ ${failed:-0} -eq 0 ] || exit ${failed:-0} @@ -510,11 +555,11 @@ test_mhmail "$expected" '-from sender@localhost' -b '' # Shows different behavior than compiled mhmail, which suppressed the newline. cat > "$expected" < +MAIL FROM: RCPT TO: DATA To: recipient@example.com -From: sender@localhost +From: sender19@localhost Date: @@ -523,7 +568,7 @@ Date: QUIT EOF -test_mhmail "$expected" '-from sender@localhost' -b ' +test_mhmail "$expected" '-from sender19@localhost' -b ' ' [ ${failed:-0} -eq 0 ] || exit ${failed:-0} @@ -533,11 +578,11 @@ test_mhmail "$expected" '-from sender@localhost' -b ' # of the newlines. cat > "$expected" < +MAIL FROM: RCPT TO: DATA To: recipient@example.com -From: sender@localhost +From: sender20@localhost Date: @@ -548,7 +593,7 @@ Date: QUIT EOF -test_mhmail "$expected" '-from sender@localhost' -b ' +test_mhmail "$expected" '-from sender20@localhost' -b ' ' @@ -559,11 +604,11 @@ test_mhmail "$expected" '-from sender@localhost' -b ' # Verified same behavior as compiled mhmail. cat > "$expected" < +MAIL FROM: RCPT TO: DATA To: recipient@example.com -From: sender@localhost +From: sender21@localhost Date: no newline in input @@ -571,7 +616,7 @@ no newline in input QUIT EOF -test_mhmail "$expected" '-from sender@localhost' -b 'no newline in input' +test_mhmail "$expected" '-from sender21@localhost' -b 'no newline in input' [ ${failed:-0} -eq 0 ] || exit ${failed:-0} @@ -580,11 +625,11 @@ test_mhmail "$expected" '-from sender@localhost' -b 'no newline in input' # of the newlines. cat > "$expected" < +MAIL FROM: RCPT TO: DATA To: recipient@example.com -From: sender@localhost +From: sender22@localhost Date: here's some text @@ -594,7 +639,7 @@ here's some text QUIT EOF -test_mhmail "$expected" '-from sender@localhost' -b "here's some text +test_mhmail "$expected" '-from sender22@localhost' -b "here's some text " [ ${failed:-0} -eq 0 ] || exit ${failed:-0} @@ -610,7 +655,7 @@ DATA Resent-To: recipient@example.com Resent-From: orig_recipient@example.com To: recipient@example.com -From: sender@localhost +From: sender23@localhost Date: Resent-Date: @@ -621,7 +666,7 @@ EOF test_mhmail "$expected" '-from orig_recipient@example.com -resent' \ -b 'To: recipient@example.com -From: sender@localhost +From: sender23@localhost Date: Sat Jun 16 18:35:15 -0500 please resend this message, 1' @@ -636,7 +681,7 @@ MAIL FROM: RCPT TO: DATA To: recipient@example.com -From: sender@localhost +From: sender24@localhost Date: Resent-To: recipient@example.com Resent-From: orig_recipient@example.com @@ -650,7 +695,7 @@ EOF test_mhmail "$expected" \ '-from orig_recipient@example.com -resent -profile -nomsgid' \ '|' 'To: recipient@example.com -From: sender@localhost +From: sender24@localhost Date: Sat Jun 16 18:35:15 -0500 please resend this message, 2' @@ -666,7 +711,7 @@ MAIL FROM: RCPT TO: DATA To: recipient@example.com -From: sender@localhost +From: sender25@localhost Date: Resent-To: recipient@example.com Resent-From: orig_recipient@example.com @@ -680,7 +725,7 @@ EOF test_mhmail "$expected" \ '-from orig_recipient@example.com -resent -profile -nomsgid' \ -b 'To: recipient@example.com -From: sender@localhost +From: sender25@localhost Date: Sat Jun 16 18:35:15 -0500 please resend this message, 3' @@ -688,15 +733,15 @@ please resend this message, 3' [ ${failed:-0} -eq 0 ] || exit ${failed:-0} -# check -header-field. +# check -headerfield. # Not supported by compiled mhmail. cat > "$expected" < +MAIL FROM: RCPT TO: DATA To: recipient@example.com -From: sender@example.com +From: sender26@example.com User-Agent: nmh Date: @@ -706,21 +751,21 @@ QUIT EOF test_mhmail "$expected" \ - '-from sender@example.com -header-field User-Agent:nmh' \ + '-from sender26@example.com -headerfield User-Agent:nmh' \ -b 'with added header field' [ ${failed:-0} -eq 0 ] || exit ${failed:-0} -# check multiple -header-fields. +# check multiple -headerfields. # Not supported by compiled mhmail. cat > "$expected" < +MAIL FROM: RCPT TO: DATA To: recipient@example.com -From: sender@example.com +From: sender27@example.com MIME-Version: 1.0 Content-Type: text/plain;charset=utf-8 Content-Transfer-Encoding: 8bit @@ -732,12 +777,52 @@ QUIT EOF test_mhmail "$expected" \ - "-from sender@example.com -header-field MIME-Version:1.0 \ --header-field Content-Type:text/plain;charset=utf-8 \ --header-field Content-Transfer-Encoding:8bit" \ + "-from sender27@example.com -headerfield MIME-Version:1.0 \ +-headerfield Content-Type:text/plain;charset=utf-8 \ +-headerfield Content-Transfer-Encoding:8bit" \ -b 'with added header fields' [ ${failed:-0} -eq 0 ] || exit ${failed:-0} +# check -attach +# Not supported by compiled mhmail. +cat > "$expected" < +RCPT TO: +DATA +To: recipient@example.com +From: sender28@example.com +MIME-Version: 1.0 +Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0" +Date: +Message-ID: + +------- =_aaaaaaaaaa0 +Content-Type: text/plain; charset="us-ascii" + +See how easy it is to add an attachment! + +------- =_aaaaaaaaaa0 +Content-Type: `content_type_string ${srcdir}/test/mhmail/attachment.txt` +Content-Description: attachment.txt +Content-Disposition: attachment; filename="attachment.txt" + +The future disappears into memory, With only a moment between, +Forever dwells in that moment, hope is what remains to be seen +Forever dwells in that moment, hope is what remains to be seen. + +------- =_aaaaaaaaaa0-- +. +QUIT +EOF + +test_mhmail "$expected" \ + "-from sender28@example.com -attach ${srcdir}/test/mhmail/attachment.txt" \ + -b 'See how easy it is to add an attachment!' + +[ ${failed:-0} -eq 0 ] || exit ${failed:-0} + + exit ${failed:-0}