In test-mhfixmsg, run output through uniq before head instead of after.

[nmh] / test / mhfixmsg / test-mhfixmsg
diff --git a/test/mhfixmsg/test-mhfixmsg b/test/mhfixmsg/test-mhfixmsg

index 497fd87a34a6bf43517ac13f24243921b69f1f6e..851c3c97f655918c71c3e05f9a1e84215d7048af 100755 (executable)
--- a/test/mhfixmsg/test-mhfixmsg
+++ b/test/mhfixmsg/test-mhfixmsg
@@ -606,30 +606,6 @@ Content-Type: text/html; charset="ISO-8859-1"
  Content-Transfer-Encoding: quoted-printable
  
  <body>
  Content-Transfer-Encoding: quoted-printable
  
  <body>
-<table width=3D"325" border=3D"0" cellspacing=3D"0" cellpadding=3D"0">
-<tr><td><font face=3D"Arial, Helvetica, sans-serif" color=3D"#333333" size=
-=3D"2"><strong>Mile</strong></font></td><td height=3D"3">&nbsp;</td><td al=
-ign=3D"right"><font face=3D"Arial, Helvetica, sans-serif" color=3D"#333333=
-" size=3D"2">$0.00</font></td></tr><tr><td><font face=3D"Arial, Helvetica,=
- sans-serif" color=3D"#333333" size=3D"2"><strong>Time</strong></font></td=
-><td height=3D"3">&nbsp;</td><td align=3D"right"><font face=3D"Arial, Helv=
-etica, sans-serif" color=3D"#333333" size=3D"2">$78.71</font></td></tr><tr=
-><td><font face=3D"Arial, Helvetica, sans-serif" color=3D"#333333" size=3D=
-"2"><strong>State Tax</strong></font></td><td height=3D"3">&nbsp;</td><td =
-align=3D"right"><font face=3D"Arial, Helvetica, sans-serif" color=3D"#3333=
-33" size=3D"2">$5.90</font></td></tr><tr><td><font face=3D"Arial, Helvetic=
-a, sans-serif" color=3D"#333333" size=3D"2"><strong>Vehicle License Fee</s=
-trong></font></td><td height=3D"3">&nbsp;</td><td align=3D"right"><font fa=
-ce=3D"Arial, Helvetica, sans-serif" color=3D"#333333" size=3D"2">$1.84</fo=
-nt></td></tr><tr><td><font face=3D"Arial, Helvetica, sans-serif" color=3D"=
-#333333" size=3D"2"><strong>State Txn Tax</strong></font></td><td height=3D=
-"3">&nbsp;</td><td align=3D"right"><font face=3D"Arial, Helvetica, sans-se=
-rif" color=3D"#333333" size=3D"2">$6.00</font></td></tr>
-
-</body>
-</html>
-
-------=_nmh-multipart--
  EOF
  
  cat >`mhpath new` <<'EOF'
  EOF
  
  cat >`mhpath new` <<'EOF'
@@ -668,9 +644,10 @@ EOF
  
  if [ $can_reformat_texthtml -eq 1 ]; then
    #### lynx inserts multiple blank lines, so use uniq to squeeze them.
  
  if [ $can_reformat_texthtml -eq 1 ]; then
    #### lynx inserts multiple blank lines, so use uniq to squeeze them.
-  mhfixmsg last -outfile - | uniq >"$actual"
-# ????  check "$expected" "$actual" 'ignore space'
-  /bin/rm "$expected" "$actual"
+  #### Truncate to avoid comparing the html portion because it can
+  #### get reformatted.
+  mhfixmsg last -outfile - | uniq | head -22 >"$actual"
+  check "$expected" "$actual" 'ignore space'
  else
    cp -p "$MH_TEST_DIR/Mail/inbox/15" "$MH_TEST_DIR/Mail/inbox/15.backup"
    rm -f "$expected"
  else
    cp -p "$MH_TEST_DIR/Mail/inbox/15" "$MH_TEST_DIR/Mail/inbox/15.backup"
    rm -f "$expected"