Removed myuid and mygid variables, they're no longer used and

[nmh] / test / post / test-sendfiles

diff --git a/test/post/test-sendfiles b/test/post/test-sendfiles
index cc4596075aea6b7d8f796b7b45062b7c22f08920..af5573ea9d287c8631348c3fd30d8b1f1bee9962 100755 (executable)
--- a/test/post/test-sendfiles
+++ b/test/post/test-sendfiles
@@ -60,7 +60,8 @@ test_sendfiles ()
   inc -silent -file "$mbox"
   rm -f "$mbox" "$mbox.map"
 
   inc -silent -file "$mbox"
   rm -f "$mbox" "$mbox.map"
 

-  mhlist -verbose last | sed -e 's/ *$//' >"$actual"
+  mhlist -verbose last | sed -e 's/ *$//' -e 's/\(octet-stream\).*$/\1/' \
+    >"$actual"

   (cd $MH_TEST_DIR/tmp  &&
    contents=`mhstore -noauto last 2>&1 | \
              sed -e 's/storing message.*as file //'`  &&
   (cd $MH_TEST_DIR/tmp  &&
    contents=`mhstore -noauto last 2>&1 | \
              sed -e 's/storing message.*as file //'`  &&


@@ -80,7 +81,7 @@ Usage: sendfiles [switches] -to recipient -subject subject file1 [file2 ...]
   or
        sendfiles [switches] recipient subject file1 [file2 ...]
   switches are:
   or
        sendfiles [switches] recipient subject file1 [file2 ...]
   switches are:

-  -compress [bzip2 | compress | gzip | lzma | none | zip]
+  -compress [bzip2 | compress | gzip | lzma | none]

   -from <sender>
   -[delay] <delay> (expressed in seconds)
   -version
   -from <sender>
   -[delay] <delay> (expressed in seconds)
   -version


@@ -104,7 +105,7 @@ run_test 'sendfiles -nonexistent' "Usage: sendfiles [switches] -to recipient \
   or
        sendfiles [switches] recipient subject file1 [file2 ...]
   switches are:
   or
        sendfiles [switches] recipient subject file1 [file2 ...]
   switches are:

-  -compress [bzip2 | compress | gzip | lzma | none | zip]
+  -compress [bzip2 | compress | gzip | lzma | none]

   -from <sender>
   -[delay] <delay> (expressed in seconds)
   -version
   -from <sender>
   -[delay] <delay> (expressed in seconds)
   -version


@@ -119,7 +120,7 @@ Usage: sendfiles [switches] -to recipient \
   or
        sendfiles [switches] recipient subject file1 [file2 ...]
   switches are:
   or
        sendfiles [switches] recipient subject file1 [file2 ...]
   switches are:

-  -compress [bzip2 | compress | gzip | lzma | none | zip]
+  -compress [bzip2 | compress | gzip | lzma | none]

   -from <sender>
   -[delay] <delay> (expressed in seconds)
   -version
   -from <sender>
   -[delay] <delay> (expressed in seconds)
   -version


@@ -136,12 +137,11 @@ Usage: sendfiles [switches] -to recipient \
 [ "`findprog gzip`" ]      &&  test_sendfiles 'gzip -cd' new -compress gzip
 [ "`findprog gzip`" ]      &&  test_sendfiles 'gzip -cd' new -gzip
 [ "`findprog lzma`" ]      &&  test_sendfiles 'lzma -cd' new -compress lzma
 [ "`findprog gzip`" ]      &&  test_sendfiles 'gzip -cd' new -compress gzip
 [ "`findprog gzip`" ]      &&  test_sendfiles 'gzip -cd' new -gzip
 [ "`findprog lzma`" ]      &&  test_sendfiles 'lzma -cd' new -compress lzma

-[ "`findprog zip`" ]       &&  test_sendfiles 'unzip -p' new -compress zip

 
 # check with no compression
 cat >"$expected" <<EOF
  msg part  type/subtype              size description
 
 # check with no compression
 cat >"$expected" <<EOF
  msg part  type/subtype              size description

-  11       application/octet-stream   10K
+  11       application/octet-stream

             type="tar"
             (extract with cat | tar xvpf -)
 EOF
             type="tar"
             (extract with cat | tar xvpf -)
 EOF


@@ -151,7 +151,7 @@ test_sendfiles cat new -compress none
 # check with no compression, -none
 cat >"$expected" <<EOF
  msg part  type/subtype              size description
 # check with no compression, -none
 cat >"$expected" <<EOF
  msg part  type/subtype              size description

-  11       application/octet-stream   10K
+  11       application/octet-stream

             type="tar"
             (extract with cat | tar xvpf -)
 EOF
             type="tar"
             (extract with cat | tar xvpf -)
 EOF


@@ -161,7 +161,7 @@ test_sendfiles cat new -none
 # check old argument style (without -to and -subject)
 cat >"$expected" <<EOF
  msg part  type/subtype              size description
 # check old argument style (without -to and -subject)
 cat >"$expected" <<EOF
  msg part  type/subtype              size description

-  11       application/octet-stream   10K
+  11       application/octet-stream

             type="tar"
             (extract with cat | tar xvpf -)
 EOF
             type="tar"
             (extract with cat | tar xvpf -)
 EOF


@@ -171,7 +171,7 @@ test_sendfiles cat old -compress none
 # check -from
 cat >"$expected" <<EOF
  msg part  type/subtype              size description
 # check -from
 cat >"$expected" <<EOF
  msg part  type/subtype              size description

-  11       application/octet-stream   10K
+  11       application/octet-stream

             type="tar"
             (extract with cat | tar xvpf -)
 EOF
             type="tar"
             (extract with cat | tar xvpf -)
 EOF


@@ -181,7 +181,7 @@ test_sendfiles cat new -compress none -from 'Sender <sender@example.com>'
 # check PERSON environment variable
 cat >"$expected" <<EOF
  msg part  type/subtype              size description
 # check PERSON environment variable
 cat >"$expected" <<EOF
  msg part  type/subtype              size description

-  11       application/octet-stream   10K
+  11       application/octet-stream

             type="tar"
             (extract with cat | tar xvpf -)
 EOF
             type="tar"
             (extract with cat | tar xvpf -)
 EOF


@@ -191,7 +191,7 @@ 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
 # 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   10K
+  11       application/octet-stream

             type="tar"
             (extract with cat | tar xvpf -)
 EOF
             type="tar"
             (extract with cat | tar xvpf -)
 EOF


@@ -201,7 +201,7 @@ 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
 # 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   10K
+  11       application/octet-stream

             type="tar"
             (extract with cat | tar xvpf -)
 EOF
             type="tar"
             (extract with cat | tar xvpf -)
 EOF