X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/f570fea8a0911b284017066471be12d2fe9bd3b6..0c50c669:/test/whatnow/test-attach-detach?ds=sidebyside

diff --git a/test/whatnow/test-attach-detach b/test/whatnow/test-attach-detach
index 15641f47..3181f21b 100755
--- a/test/whatnow/test-attach-detach
+++ b/test/whatnow/test-attach-detach
@@ -82,109 +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? 
+#text/plain; name="context" <> [context]{attachment} ${MH_TEST_DIR}/Mail/context
 EOF
 else
 cat >"$expected" <<EOF
-
-What now? 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
 whatnow: attach command requires file argument(s).
-
-What now? at -v -a 0
+at -v
 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
+#text/plain; name="context" <> [context]{attachment} ${MH_TEST_DIR}/Mail/context
+quit -delete
 EOF
 fi
 
-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"