X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/7986520468a4956200566b728d9ea2263e28e2bc..a30ef3465250ae21bb3928a6e120ba4351cf8ff0:/test/whatnow/test-attach-detach

diff --git a/test/whatnow/test-attach-detach b/test/whatnow/test-attach-detach
index f7c39e9d..ba22a19c 100755
--- a/test/whatnow/test-attach-detach
+++ b/test/whatnow/test-attach-detach
@@ -45,17 +45,19 @@ whatnowtest=`echo cd | whatnow -prompt ''`
 set -e
 
 case ${whatnowtest} in
-    cd) cat > "$expected" <<EOF
+    cd) cat >"$expected" <<EOF
 attach $testname_quoted
 alist
 $testname
 detach $testname_quoted
 alist
 EOF
+readline=1
     ;;
-    "") cat > "$expected" <<EOF
+    "") cat >"$expected" <<EOF
 $testname
 EOF
+readline=0
     ;;
     *) echo "Unknown response to whatnow readline test"
     echo "Response is: ${whatnowtest}"
@@ -66,18 +68,45 @@ 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"
 check "$expected" "$actual"
 
+if [ "$readline" = 0 ]; then
+cat >"$expected" <<EOF
+whatnow: attach command requires file argument(s).
+whatnow: attach command requires file argument(s).
+Attaching ${MH_TEST_DIR}/Mail/context as a text/plain
+EOF
+else
+cat >"$expected" <<EOF
+at
+whatnow: attach command requires file argument(s).
+at -v
+whatnow: attach command requires file argument(s).
+at -v Mail/context
+Attaching ${MH_TEST_DIR}/Mail/context as a text/plain
+quit -delete
+EOF
+fi
+
+printf '%s\n' \
+  'at' \
+  'at -v' \
+  'at -v Mail/context' \
+  'quit -delete' | whatnow -prompt '' 2>&1 | \
+  sed -e 's/; charset=us-ascii//' >"$actual"
+
+check "$expected" "$actual"
+
 test ${failed:-0} -eq 0  &&  rm "$testname"
 
 exit $failed