Final fix to test-attach-detach: on some platforms, there's no

[nmh] / test / whatnow / test-attach-detach

diff --git a/test/whatnow/test-attach-detach b/test/whatnow/test-attach-detach
index f674a4f5b95a6477bc7e337572a183d547fee0ff..c7b717f8ed10c550d73382e5349e1ecdf3e0eb64 100755 (executable)
--- a/test/whatnow/test-attach-detach
+++ b/test/whatnow/test-attach-detach
@@ -52,10 +52,12 @@ $testname
 detach $testname_quoted
 alist
 EOF
 detach $testname_quoted
 alist
 EOF

+readline=1

     ;;
     "") cat >"$expected" <<EOF
 $testname
 EOF
     ;;
     "") cat >"$expected" <<EOF
 $testname
 EOF

+readline=0

     ;;
     *) echo "Unknown response to whatnow readline test"
     echo "Response is: ${whatnowtest}"
     ;;
     *) echo "Unknown response to whatnow readline test"
     echo "Response is: ${whatnowtest}"


@@ -78,6 +80,42 @@ set -e
 check "$expectederr" "$actualerr"
 check "$expected" "$actual"
 
 check "$expectederr" "$actualerr"
 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; name="context" <> [context]{attachment} ${MH_TEST_DIR}/Mail/context
+
+What now? whatnow: ingoring invalid attachformat value of 3
+#text/plain; name="context" <> [context]{attachment} ${MH_TEST_DIR}/Mail/context
+
+What now? #text/plain; name="context" <> [context]{attachment} ${MH_TEST_DIR}/Mail/context
+
+What now? #text/plain; name="context" <> [context]{attachment} ${MH_TEST_DIR}/Mail/context
+
+What now? #text/plain; name="context"; x-unix-mode=0600 [  ASCII text ] ${MH_TEST_DIR}/Mail/context
+
+What now? 
+EOF
+else

 cat >"$expected" <<EOF
 
 What now? at
 cat >"$expected" <<EOF
 
 What now? at


@@ -108,23 +146,27 @@ What now? at -a 0 Mail/context
 
 What now? at -v -a Mail/context
 whatnow: ignoring attach -a without format argument.
 
 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
+#text/plain; name="context" <> [context]{attachment} ${MH_TEST_DIR}/Mail/context

 
 What now? at -v -a 3 Mail/context
 whatnow: ingoring invalid attachformat value of 3
 
 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
+#text/plain; name="context" <> [context]{attachment} ${MH_TEST_DIR}/Mail/context

 
 What now? at -v Mail/context
 
 What now? at -v Mail/context

-#text/plain; charset=us-ascii; name="context" <> [context]{attachment} ${MH_TEST_DIR}/Mail/context
+#text/plain; name="context" <> [context]{attachment} ${MH_TEST_DIR}/Mail/context

 
 What now? at -v -a 1 Mail/context
 
 What now? at -v -a 1 Mail/context

-#text/plain; charset=us-ascii; name="context" <> [context]{attachment} ${MH_TEST_DIR}/Mail/context
+#text/plain; name="context" <> [context]{attachment} ${MH_TEST_DIR}/Mail/context

 
 What now? at -v -a 0 Mail/context
 
 What now? at -v -a 0 Mail/context

-#text/plain; charset=us-ascii; name="context"; x-unix-mode=0644 [  ASCII text ] ${MH_TEST_DIR}/Mail/context
+#text/plain; name="context"; x-unix-mode=0600 [  ASCII text ] ${MH_TEST_DIR}/Mail/context

 
 What now? quit -delete
 EOF
 
 What now? 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' \
 
 set +e
 printf '%s\n' \


@@ -141,9 +183,12 @@ printf '%s\n' \
 'at -v Mail/context' \
 'at -v -a 1 Mail/context' \
 'at -v -a 0 Mail/context' \
 'at -v Mail/context' \
 'at -v -a 1 Mail/context' \
 'at -v -a 0 Mail/context' \

-'quit -delete' | whatnow >$actual 2>&1
+'quit -delete' | whatnow 2>&1 | sed -e 's/; charset=us-ascii//' >"$actual"

 set -e
 
 set -e
 

+#### Without readline, need to add trailing newline.
+[ "$readline" = 0 ] && printf '\n' >>"$actual"
+

 check "$expected" "$actual"
 
 test ${failed:-0} -eq 0  &&  rm "$testname"
 check "$expected" "$actual"
 
 test ${failed:-0} -eq 0  &&  rm "$testname"