Don't recurse in advertise() on writev(2) error, just write(2).

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

diff --git a/test/whatnow/test-attach-detach b/test/whatnow/test-attach-detach
index f674a4f5b95a6477bc7e337572a183d547fee0ff..ba22a19c54235f10139e046608592422f9219687 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}"


@@ -66,83 +68,42 @@ esac
 # whatnow's exit status is always 1 so that is not a failure
 set +e
 echo "attach $testname_quoted" | \
 # 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" | \
 echo "alist" | \

-  run_prog whatnow -attach foo -noedit -prompt '' 2>>$actualerr >>$actual
+  run_prog whatnow -noedit -prompt '' 2>>$actualerr >>$actual

 echo "detach $testname_quoted" | \
 echo "detach $testname_quoted" | \

-  run_prog whatnow -attach foo -noedit -prompt '' 2>>$actualerr >>$actual
+  run_prog whatnow -noedit -prompt '' 2>>$actualerr >>$actual

 echo "alist" | \
 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"
 
 set -e
 
 check "$expectederr" "$actualerr"
 check "$expected" "$actual"
 

+if [ "$readline" = 0 ]; then

 cat >"$expected" <<EOF
 cat >"$expected" <<EOF

-
-What now? at
-whatnow: attach command requires file argument(s).
-
-What now? at -v

 whatnow: attach command requires file argument(s).
 whatnow: attach command requires file argument(s).

-
-What now? at -v -a
-whatnow: ignoring attach -a without format argument.
-whatnow: attach command requires file argument(s).
-
-What now? at -v -a 0

 whatnow: attach command requires file argument(s).
 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.
+Attaching ${MH_TEST_DIR}/Mail/context as a text/plain
+EOF
+else
+cat >"$expected" <<EOF
+at

 whatnow: attach command requires file argument(s).
 whatnow: attach command requires file argument(s).

-
-What now? at -a 0 -v
+at -v

 whatnow: attach command requires file argument(s).
 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=0644 [  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
 EOF

+fi

 
 

-set +e

 printf '%s\n' \
 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
+  'at' \
+  'at -v' \
+  'at -v Mail/context' \
+  'quit -delete' | whatnow -prompt '' 2>&1 | \
+  sed -e 's/; charset=us-ascii//' >"$actual"

 
 check "$expected" "$actual"
 
 
 check "$expected" "$actual"