X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/2898c0505c510ea21ad66a05c90154df53b3e033..eb21eed294df1be56bce4bf8ecf16a4c65e7f12f:/test/whatnow/test-attach-detach

diff --git a/test/whatnow/test-attach-detach b/test/whatnow/test-attach-detach
index c06f96ef..ba22a19c 100755
--- a/test/whatnow/test-attach-detach
+++ b/test/whatnow/test-attach-detach
@@ -68,13 +68,13 @@ esac
 # whatnow's exit status is always 1 so that is not a failure
 set +e
 echo "attach $testname_quoted" | \
-  run_prog whatnow -attach foo -noedit -prompt '' 2>>$actualerr >>$actual
+  run_prog whatnow -noedit -prompt '' 2>>$actualerr >>$actual
 echo "alist" | \
-  run_prog whatnow -attach foo -noedit -prompt '' 2>>$actualerr >>$actual
+  run_prog whatnow -noedit -prompt '' 2>>$actualerr >>$actual
 echo "detach $testname_quoted" | \
-  run_prog whatnow -attach foo -noedit -prompt '' 2>>$actualerr >>$actual
+  run_prog whatnow -noedit -prompt '' 2>>$actualerr >>$actual
 echo "alist" | \
-  run_prog whatnow -attach foo -noedit -prompt '' 2>>$actualerr >>$actual
+  run_prog whatnow -noedit -prompt '' 2>>$actualerr >>$actual
 set -e
 
 check "$expectederr" "$actualerr"
@@ -82,112 +82,28 @@ check "$expected" "$actual"
 
 if [ "$readline" = 0 ]; then
 cat >"$expected" <<EOF
-
-What now? whatnow: attach command requires file argument(s).
-
-What now? whatnow: attach command requires file argument(s).
-
-What now? whatnow: ignoring attach -a without format argument.
-whatnow: attach command requires file argument(s).
-
-What now? whatnow: attach command requires file argument(s).
-
-What now? whatnow: ignoring attach -a without format argument.
 whatnow: attach command requires file argument(s).
-
-What now? whatnow: ignoring attach -a without format argument.
 whatnow: attach command requires file argument(s).
-
-What now? whatnow: attach command requires file argument(s).
-
-What now? 
-What now? whatnow: ignoring attach -a without format argument.
-#text/plain; charset=us-ascii; name="context" <> [context]{attachment} ${MH_TEST_DIR}/Mail/context
-
-What now? whatnow: ingoring invalid attachformat value of 3
-#text/plain; charset=us-ascii; name="context" <> [context]{attachment} ${MH_TEST_DIR}/Mail/context
-
-What now? #text/plain; charset=us-ascii; name="context" <> [context]{attachment} ${MH_TEST_DIR}/Mail/context
-
-What now? #text/plain; charset=us-ascii; name="context" <> [context]{attachment} ${MH_TEST_DIR}/Mail/context
-
-What now? #text/plain; charset=us-ascii; name="context"; x-unix-mode=0600 [  ASCII text ] ${MH_TEST_DIR}/Mail/context
-
-What now? 
+Attaching ${MH_TEST_DIR}/Mail/context as a text/plain
 EOF
 else
 cat >"$expected" <<EOF
-
-What now? at
+at
 whatnow: attach command requires file argument(s).
-
-What now? at -v
-whatnow: attach command requires file argument(s).
-
-What now? at -v -a
-whatnow: ignoring attach -a without format argument.
+at -v
 whatnow: attach command requires file argument(s).
-
-What now? at -v -a 0
-whatnow: attach command requires file argument(s).
-
-What now? at -a
-whatnow: ignoring attach -a without format argument.
-whatnow: attach command requires file argument(s).
-
-What now? at -a -v
-whatnow: ignoring attach -a without format argument.
-whatnow: attach command requires file argument(s).
-
-What now? at -a 0 -v
-whatnow: attach command requires file argument(s).
-
-What now? at -a 0 Mail/context
-
-What now? at -v -a Mail/context
-whatnow: ignoring attach -a without format argument.
-#text/plain; charset=us-ascii; name="context" <> [context]{attachment} ${MH_TEST_DIR}/Mail/context
-
-What now? at -v -a 3 Mail/context
-whatnow: ingoring invalid attachformat value of 3
-#text/plain; charset=us-ascii; name="context" <> [context]{attachment} ${MH_TEST_DIR}/Mail/context
-
-What now? at -v Mail/context
-#text/plain; charset=us-ascii; name="context" <> [context]{attachment} ${MH_TEST_DIR}/Mail/context
-
-What now? at -v -a 1 Mail/context
-#text/plain; charset=us-ascii; name="context" <> [context]{attachment} ${MH_TEST_DIR}/Mail/context
-
-What now? at -v -a 0 Mail/context
-#text/plain; charset=us-ascii; name="context"; x-unix-mode=0600 [  ASCII text ] ${MH_TEST_DIR}/Mail/context
-
-What now? quit -delete
+at -v Mail/context
+Attaching ${MH_TEST_DIR}/Mail/context as a text/plain
+quit -delete
 EOF
 fi
 
-# Don't depend on the mode of Mail/context:
-chmod 0600 ${MH_TEST_DIR}/Mail/context
-
-set +e
 printf '%s\n' \
-'at' \
-'at -v' \
-'at -v -a' \
-'at -v -a 0' \
-'at -a' \
-'at -a -v' \
-'at -a 0 -v' \
-'at -a 0 Mail/context' \
-'at -v -a Mail/context' \
-'at -v -a 3 Mail/context' \
-'at -v Mail/context' \
-'at -v -a 1 Mail/context' \
-'at -v -a 0 Mail/context' \
-'quit -delete' | whatnow >"$actual" 2>&1
-set -e
-
-#### Without readline, need to add trailing newline.
-[ "$readline" = 0 ] && printf '\n' >>"$actual"
+  'at' \
+  'at -v' \
+  'at -v Mail/context' \
+  'quit -delete' | whatnow -prompt '' 2>&1 | \
+  sed -e 's/; charset=us-ascii//' >"$actual"
 
 check "$expected" "$actual"