X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/e6c917710e4318949cb4174cabca51a8d1822dbd..0bc71c284a5004fb30f200b5069b9e8e1f14e497:/test/post/test-sendfiles

diff --git a/test/post/test-sendfiles b/test/post/test-sendfiles
index 84f54bfe..2d1ba24a 100755
--- a/test/post/test-sendfiles
+++ b/test/post/test-sendfiles
@@ -65,7 +65,7 @@ test_sendfiles ()
   (cd $MH_TEST_DIR/tmp  &&
    contents=`mhstore -noauto last 2>&1 | \
              sed -e 's/storing message.*as file //'`  &&
-   $uncompress "$contents" | tar xpf -  &&  rm -f "$contents")
+   $uncompress <"$contents" | tar xpf -  &&  rm -f "$contents")
 
   rmm last
   check "$testfiledir/$testfile" "$MH_TEST_DIR/tmp/$testfile" \
@@ -83,14 +83,13 @@ Usage: sendfiles [switches] -to recipient -subject subject file1 [file2 ...]
   switches are:
   -compress [bzip2 | compress | gzip | lzma | none]
   -from <sender>
-  -[delay] <delay> (expressed in seconds)
   -version
   -help
   Can use PERSON environment variable instead of -from switch.
 EOF
 
 #### Skip nmh intro text.
-run_prog sendfiles -help | sed '/^$/,$d' >"$actual" 2>&1
+run_prog sendfiles -help 2>&1 | sed '/^$/,$d' >"$actual"
 check "$expected" "$actual"
 
 # check -version
@@ -108,7 +107,6 @@ run_test 'sendfiles -nonexistent' "Usage: sendfiles [switches] -to recipient \
   switches are:
   -compress [bzip2 | compress | gzip | lzma | none]
   -from <sender>
-  -[delay] <delay> (expressed in seconds)
   -version
   -help
   Can use PERSON environment variable instead of -from switch."
@@ -123,7 +121,6 @@ Usage: sendfiles [switches] -to recipient \
   switches are:
   -compress [bzip2 | compress | gzip | lzma | none]
   -from <sender>
-  -[delay] <delay> (expressed in seconds)
   -version
   -help
   Can use PERSON environment variable instead of -from switch."
@@ -189,26 +186,6 @@ EOF
 
 PERSON='Sender <sender@example.com>' test_sendfiles cat new -compress none
 
-# check -delay, though for a small file it doesn't do anything
-cat >"$expected" <<EOF
- msg part  type/subtype              size description
-  11       application/octet-stream
-	     type="tar"
-	     (extract with cat | tar xvpf -)
-EOF
-
-test_sendfiles cat new -compress none -delay 5
-
-# check old style -delay, though for a small file it doesn't do anything
-cat >"$expected" <<EOF
- msg part  type/subtype              size description
-  11       application/octet-stream
-	     type="tar"
-	     (extract with cat | tar xvpf -)
-EOF
-
-test_sendfiles cat new -compress none -5
-
 rm -fr "$MH_TEST_DIR/fakesendmail" "$MH_TEST_DIR/$testfile" "$MH_TEST_DIR/tmp"