X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/f3cd885b4c8e5f6caf24472111ad2fd2791871f1..b8a6686de69dbcedbf60f5880ba86994597f2c7f:/test/mhfixmsg/test-mhfixmsg?ds=inline diff --git a/test/mhfixmsg/test-mhfixmsg b/test/mhfixmsg/test-mhfixmsg index 81d47966..f741d9c6 100755 --- a/test/mhfixmsg/test-mhfixmsg +++ b/test/mhfixmsg/test-mhfixmsg @@ -16,9 +16,10 @@ fi setup_test +check_exit '-eq 1' mhfixmsg - + #### Make sure that html-to-text conversion is what we expect. -require_locale en_US.utf-8 en_US.utf8 -LC_ALL=en_US.UTF-8; export LC_ALL +require_locale en_US.UTF-8 en_US.UTF8 en_US.utf-8 en_US.utf8 expected="$MH_TEST_DIR/test-mhfixmsg$$.expected" expected_err="$MH_TEST_DIR/test-mhfixmsg$$.expected_err" @@ -27,8 +28,7 @@ actual_err="$MH_TEST_DIR/test-mhfixmsg$$.actual_err" mhn_defaults="$MH_INST_DIR${nmhetcdir}/mhn.defaults" -if grep mhfixmsg-format-text/html "${mhn_defaults}" \ - >/dev/null; then +if grep mhfixmsg-format-text/html "${mhn_defaults}" >/dev/null; then can_reformat_texthtml=1 if grep 'mhfixmsg-format-text/html.*w3m' "${mhn_defaults}" \ >/dev/null; then @@ -70,7 +70,8 @@ Usage: mhfixmsg [+folder] [msgs] [switches] -help EOF -run_prog mhfixmsg -help >"$actual" 2>&1 +#### Skip nmh intro text. +run_prog mhfixmsg -help | sed '/^$/,$d' >"$actual" 2>&1 check "$expected" "$actual" @@ -85,15 +86,15 @@ esac # check that non-MIME messages aren't modified # check -outfile -start_test "that non-MIME messages aren't modified, and -outfile" +start_test "non-MIME messages aren't modified, and -outfile" run_test 'mhfixmsg first -outfile '"$actual" '' check "`mhpath first`" "$actual" 'keep first' # check that non-MIME messages with no bodies aren't modified # check -outfile -start_test "that non-MIME messages with no bodies aren't modified, and -outfile" -cat >`mhpath new` <"`mhpath new`" < To: Some User Date: Fri, 29 Sep 2006 00:00:00 @@ -107,7 +108,7 @@ check "`mhpath last`" "$actual" # check -nofixcte start_test "-nofixcte" -cat >"$MH_TEST_DIR"/Mail/inbox/11 <"`mhpath new`" < @@ -234,7 +241,7 @@ Content-Transfer-Encoding: 8bit ------=_nmh-multipart-- EOF -cat >"$MH_TEST_DIR"/Mail/inbox/12 <"`mhpath new`" < @@ -316,7 +323,7 @@ Content-Transfer-Encoding: 8bit ------=_nmh-multipart-3-- EOF -cat >"$MH_TEST_DIR"/Mail/inbox/12 <"`mhpath last`" <`mhpath new` <"`mhpath new`" <`mhpath new` <"`mhpath new`" <`mhpath new` <"`mhpath new`" <`mhpath new` <"`mhpath new`" <"$expected" <<'EOF' MIME-Version: 1.0 Date: Thu, 11 Apr 2013 02:47:08 -0700 @@ -749,7 +758,7 @@ Content-Type: multipart/alternative; boundary="----=_nmh-multipart" ------=_nmh-multipart Content-Type: text/plain; charset="ISO-8859-1" -Content-Transfer-Encoding: 8bit +Content-Transfer-Encoding: 7bit Mile $0.00 Time $78.71 @@ -764,7 +773,7 @@ Content-Transfer-Encoding: quoted-printable EOF -cat >`mhpath new` <<'EOF' +cat >"`mhpath new`" <<'EOF' MIME-Version: 1.0 Content-Type: text/html; charset="ISO-8859-1" Content-Transfer-Encoding: quoted-printable @@ -820,6 +829,7 @@ From: sender@example.com Subject: mhfixmsg textcharset test MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0" +Content-Transfer-Encoding: 8bit ------- =_aaaaaaaaaa0 Content-Type: text/plain; charset="utf-8"; name="square.txt" @@ -833,7 +843,7 @@ EOF #### Generated the encoded text below with: #### $ printf '\275\262=\274\n' | base64 -cat >`mhpath new` <"`mhpath new`" <"$expected" <`mhpath new` <"`mhpath new`" <"$actual" 2>"$actual.err" check "$expected" "$actual" if grep "mhfixmsg: $MH_TEST_DIR/Mail/.*, fix multipart boundary" \ @@ -933,8 +943,8 @@ check "$expected" "$actual" # check that message is not modified when -fixboundary fails -start_test "that message is not modified when -fixboundary fails" -cat >`mhpath new` <"`mhpath new`" <`mhpath new` <"`mhpath new`" <"$expected" <`mhpath new` <"`mhpath new`" <"$expected" < @@ -1097,14 +1108,14 @@ This is an RFC-822 message. and some garbage at the end EOF -cat >`mhpath new` <"`mhpath new`" < To: Some User Date: Fri, 29 Sep 2006 00:00:00 Message-Id: @test.nmh Subject: message with message/rfc822 attachment MIME-Version: 1.0 -Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaa0" +Content-Type: multipart/mixed; boundary="----- =badboundary" and some garbage before the attachment @@ -1143,7 +1154,7 @@ There are two CR-LF pairs at the end of this sentence. EOF -cat >`mhpath new` <<'EOF' +cat >"`mhpath new`" <<'EOF' MIME-Version: 1.0 From: sender@example.com To: recipient@example.com @@ -1171,7 +1182,7 @@ There were two CR-LF pairs at the end of this sentence. EOF -cat >`mhpath new` <<'EOF' +cat >"`mhpath new`" <<'EOF' MIME-Version: 1.0 From: sender@example.com To: recipient@example.com @@ -1197,13 +1208,12 @@ Content-Type: multipart/alternative; boundary="----=_Part_876302" ------=_Part_876302 Content-Type: text/plain; charset="UTF-8" -Content-Transfer-Encoding: 8bit +Content-Transfer-Encoding: 7bit Yes, the text/plain part really was empty. ------=_Part_876302 Content-Type: text/html; charset="UTF-8" -Content-Transfer-Encoding: 8bit Content-Disposition: inline @@ -1217,7 +1227,7 @@ Content-Disposition: inline ------=_Part_876302-- EOF -cat >`mhpath new` <<'EOF' +cat >"`mhpath new`" <<'EOF' To: recipient@example.com From: sender@example.com Subject: mhfixmsg replacement of bad text/plain part test @@ -1233,7 +1243,6 @@ Content-Disposition: inline ------=_Part_876302 Content-Type: text/html; charset="UTF-8" -Content-Transfer-Encoding: 8bit Content-Disposition: inline @@ -1275,7 +1284,6 @@ Content-Disposition: inline ------=_Part_876302 Content-Type: text/html; charset="UTF-8" -Content-Transfer-Encoding: 8bit Content-Disposition: inline @@ -1319,7 +1327,7 @@ Content-Disposition: attachment; ------- =_aaaaaaaaaa0-- EOF -cat >`mhpath new` <"`mhpath new`" <"$MH_TEST_DIR/Mail/rmmproc" <<'EOF' +if [ $can_reformat_texthtml -eq 1 ]; then + # check rmmproc + start_test "rmmproc" + cat >"$MH_TEST_DIR/Mail/rmmproc" <<'EOF' mv "$1" "$1.backup" EOF -chmod a+x "${MH_TEST_DIR}/Mail/rmmproc" -echo "rmmproc: ${MH_TEST_DIR}/Mail/rmmproc" >>"$MH" -cp "${MH_TEST_DIR}/Mail/inbox/16" "${MH_TEST_DIR}/Mail/inbox/16.original" + chmod a+x "${MH_TEST_DIR}/Mail/rmmproc" + echo "rmmproc: ${MH_TEST_DIR}/Mail/rmmproc" >>"$MH" + cp "${MH_TEST_DIR}/Mail/inbox/16" "${MH_TEST_DIR}/Mail/inbox/16.original" -run_test 'mhfixmsg 16' '' -check "${MH_TEST_DIR}/Mail/inbox/16.backup" \ - "${MH_TEST_DIR}/Mail/inbox/16.original" + run_test 'mhfixmsg 16' '' + check "${MH_TEST_DIR}/Mail/inbox/16.backup" \ + "${MH_TEST_DIR}/Mail/inbox/16.original" -# check -normmproc -start_test "-normmproc" -cp "${MH_TEST_DIR}/Mail/inbox/21" "${MH_TEST_DIR}/Mail/inbox/22" + # check -normmproc + start_test "-normmproc" + cp "${MH_TEST_DIR}/Mail/inbox/21" "${MH_TEST_DIR}/Mail/inbox/22" -run_test 'mhfixmsg 21 -normmproc' -check "${MH_TEST_DIR}/Mail/inbox/22" \ - "${MH_TEST_DIR}/Mail/inbox/,21" 'keep first' + run_test 'mhfixmsg 21 -normmproc' + check "${MH_TEST_DIR}/Mail/inbox/22" \ + "${MH_TEST_DIR}/Mail/inbox/,21" 'keep first' +fi # check -rmmproc @@ -1395,7 +1405,7 @@ this is plain text ------- =_aaaaaaaaaa0-- EOF -cat >`mhpath new` <"`mhpath new`" < @@ -1446,7 +1456,7 @@ Content-Transfer-Encoding: 8bit ------- =_aaaaaaaaaa0-- EOF -cat >`mhpath new` <"`mhpath new`" <`mhpath new` <"`mhpath new`" <`mhpath new` <"`mhpath new`" <`mhpath new` <"`mhpath new`" <"$expected.err" <`mhpath new` <"`mhpath new`" <"$actual.err" set -e #### Expected output is identical to the input message. -check `mhpath last` "$actual" 'keep first' +check "`mhpath last`" "$actual" 'keep first' check "$expected.err" "$actual.err" @@ -1706,12 +1716,77 @@ check "$expected.err" "$actual.err" # (the charset string is missing its closing quote) with -outfile, and # input from stdin. Don't check err output, because it contains the name # of a tmp file. It's similar to that of the previous check. -start_test "that input is passed through to output when there's a parse error" +start_test "input is passed through to output when there's a parse error" set +e run_prog mhfixmsg -file - -outfile - <`mhpath last` >"$actual" 2>/dev/null set -e #### Expected output is identical to the input message. -check `mhpath last` "$actual" +check "`mhpath last`" "$actual" 'keep first' + + +start_test "pass through message with relative folder path with parse error" +#### Factor out leading portion of current folder path and make it relative. +pwd=`pwd` +set +e +run_prog mhfixmsg +./`mhpath | sed "s%^$pwd/%%"` last -out - >"$actual" 2>/dev/null +set -e +folder -f +inbox >/dev/null +#### Expected output is identical to the input message. +check "`mhpath last`" "$actual" + + +start_test "fix RFC 2047 encoded header parameters" +#### Also, add C-T-E:8bit to the message headers. +cat >"$expected" <"`mhpath new`" <"$actual" 2>/dev/null +check "$expected" "$actual" # make sure there are no tmp files left over