A little tiny bit closer to working.

[nmh] / test / rcv / test-rcvdist

diff --git a/test/rcv/test-rcvdist b/test/rcv/test-rcvdist
index afb90ac80599863df4246a61137ed9d06fe919b3..5e34615eedd2dd6741eb21e48f651670e210f6db 100755 (executable)
--- a/test/rcv/test-rcvdist
+++ b/test/rcv/test-rcvdist
@@ -38,7 +38,7 @@ check "$expected" "$actual"
 # check -version
 case `$rcvdist -v` in
   rcvdist\ --*) ;;
 # check -version
 case `$rcvdist -v` in
   rcvdist\ --*) ;;

-  *           ) printf "$0: rcvdist -v generated unexpected output\n" >&2
+  *           ) printf '%s: rcvdist -v generated unexpected output\n' "$0" >&2

                 failed=`expr ${failed:-0} + 1`;;
 esac
 
                 failed=`expr ${failed:-0} + 1`;;
 esac
 


@@ -50,49 +50,59 @@ run_test "$rcvdist -nonexistent" \
 run_test "$rcvdist" \
   'rcvdist: usage: rcvdist [switches] [switches for postproc] address ...'
 
 run_test "$rcvdist" \
   'rcvdist: usage: rcvdist [switches] [switches for postproc] address ...'
 

-# check with address
-# Replace post:
-cat >"$MH_TEST_DIR/Mail/notpost" <<EOF
-if grep '^Resent-From: ' "\$2" >/dev/null; then
-  cp "\$2" "$actual"
-else
-  printf 'post: message has no Resent-From: header\n'
-  printf 'post: See default components files for examples\n'
-  printf 'post: re-format message and try again\n'
-  exit 1
-fi
-EOF
-chmod u+x "$MH_TEST_DIR/Mail/notpost"
-sed 's/postproc:.*/#:/' "$MH" > "${MH}-new"
-printf "postproc: $MH_TEST_DIR/Mail/notpost\n" >>"${MH}-new"
-mv -f "${MH}-new" "$MH"
+#### Use sendmail/pipe below to override default mts.
+mts_fakesendmail="${MHMTSCONF}-fakesendmail"
+sed -e 's/^mts:.*/mts: sendmail\/pipe/' "${MHMTSCONF}" > "$mts_fakesendmail"
+printf 'sendmail: %s/test/fakesendmail\n' "$srcdir" >>"$mts_fakesendmail"
+MHMTSCONF="$mts_fakesendmail"
+
+# arguments: rcvdist switches
+test_rcvdist ()
+{
+  $rcvdist "$@"
+
+  # fakesendmail drops the message and any cc's into this mbox.
+  mbox="${MH_TEST_DIR}"/Mail/fakesendmail.mbox
+  inc -silent -file "$mbox"
+  rm -f "$mbox" "$mbox.map"
+
+  # It's hard to calculate the exact Date: header post is going to
+  # use, so we'll just use sed to remove the actual date so we can
+  # easily compare it against our "correct" output.
+  sed -e 's/^Resent-Date:.*/Resent-Date:/' `mhpath last` > "$actual"
+
+  check "$expected" "$actual"
+}

 
 

-#### An extra space gets inserted between each header field name
-#### and body.  That probably should be fixed.
+# check with address

 cat > "$expected" <<EOF
 cat > "$expected" <<EOF

-From:  Test1 <test1@example.com>
-To:  Some User <user@example.com>
-Date:  Fri, 29 Sep 2006 00:00:00
-Subject:  Testing message 1
-Resent-From:  `${MH_LIB_DIR}/ap -format '%(localmbox)' 0`
-Resent-To:  recipient@example.com
+From: Test1 <test1@example.com>
+To: Some User <user@example.com>
+Date: Fri, 29 Sep 2006 00:00:00
+Message-Id: 1@test.nmh
+Subject: Testing message 1
+Resent-From: `${MH_LIB_DIR}/ap -format '%(localmbox)' 0 | \
+              sed 's/^<\(.*\)>$/\1/'`
+Resent-To: recipient@example.com
+Resent-Date:

 
 This is message number 1
 EOF
 
 
 This is message number 1
 EOF
 

-$rcvdist recipient@example.com < "$MH_TEST_DIR/Mail/inbox/1"
-check "$expected" "$actual"
+test_rcvdist recipient@example.com < "$MH_TEST_DIR/Mail/inbox/1"

 
 # check -form
 cat > "$expected" <<EOF
 
 # check -form
 cat > "$expected" <<EOF

-From:  Test1 <test1@example.com>
-To:  Some User <user@example.com>
-Date:  Fri, 29 Sep 2006 00:00:00
-Subject:  Testing message 1
+From: Test2 <test2@example.com>
+To: Some User <user@example.com>
+Date: Fri, 29 Sep 2006 00:00:00
+Message-Id: 2@test.nmh
+Subject: Testing message 2

 Resent-To: recipient@example.com
 Resent-From: Some User <user@example.com>
 Resent-To: recipient@example.com
 Resent-From: Some User <user@example.com>

+Resent-Date:

 
 

-This is message number 1
+This is message number 2

 EOF
 
 cat > "$MH_TEST_DIR/Mail/rcvdistcomps" <<'EOF'
 EOF
 
 cat > "$MH_TEST_DIR/Mail/rcvdistcomps" <<'EOF'


@@ -102,8 +112,8 @@ cat > "$MH_TEST_DIR/Mail/rcvdistcomps" <<'EOF'
 %<(nonnull)%(void(width))%(putaddr Resent-From:)\n%>
 EOF
 
 %<(nonnull)%(void(width))%(putaddr Resent-From:)\n%>
 EOF
 

-$rcvdist -form "$MH_TEST_DIR/Mail/rcvdistcomps" recipient@example.com < \
-  "$MH_TEST_DIR/Mail/inbox/1"
-check "$expected" "$actual"
+test_rcvdist -form "$MH_TEST_DIR/Mail/rcvdistcomps" recipient@example.com \
+  < "$MH_TEST_DIR/Mail/inbox/2"
+

 
 exit ${failed:-0}
 
 exit ${failed:-0}