Fixed test-attach-detach to work with any umask, and without readline.

diff --git a/test/common.sh.in b/test/common.sh.in
index 13db440a004a14f95c01cfa19c4c56ad2b4c89e4..5f30889316e38fb173c012503790f42ab2bbda4d 100644 (file)
--- a/test/common.sh.in
+++ b/test/common.sh.in
@@ -287,6 +287,8 @@ EOF
   done
 
   folder -create +inbox > /dev/null
   done
 
   folder -create +inbox > /dev/null

+  # test/whatnow/test-attach-detach depends on the mode of context:
+  chmod 0600 ${MH_TEST_DIR}/Mail/context

   # create 10 basic messages
   for i in 1 2 3 4 5 6 7 8 9 10;
   do
   # create 10 basic messages
   for i in 1 2 3 4 5 6 7 8 9 10;
   do

diff --git a/test/whatnow/test-attach-detach b/test/whatnow/test-attach-detach
index f674a4f5b95a6477bc7e337572a183d547fee0ff..15941025efbc91d131098a272517dbcc8ed3cec8 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; charset=us-ascii; name="context" <> [context]{attachment} /home/levine/lib/src/nmh/test/testdir/Mail/context
+
+What now? whatnow: ingoring invalid attachformat value of 3
+#text/plain; charset=us-ascii; name="context" <> [context]{attachment} /home/levine/lib/src/nmh/test/testdir/Mail/context
+
+What now? #text/plain; charset=us-ascii; name="context" <> [context]{attachment} /home/levine/lib/src/nmh/test/testdir/Mail/context
+
+What now? #text/plain; charset=us-ascii; name="context" <> [context]{attachment} /home/levine/lib/src/nmh/test/testdir/Mail/context
+
+What now? #text/plain; charset=us-ascii; name="context"; x-unix-mode=0600 [  ASCII text ] /home/levine/lib/src/nmh/test/testdir/Mail/context
+
+What now? 
+EOF
+else

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


@@ -121,10 +159,11 @@ 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" <> [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
+#text/plain; charset=us-ascii; name="context"; x-unix-mode=0600 [  ASCII text ] ${MH_TEST_DIR}/Mail/context

 
 What now? quit -delete
 EOF
 
 What now? quit -delete
 EOF

+fi

 
 set +e
 printf '%s\n' \
 
 set +e
 printf '%s\n' \


@@ -141,9 +180,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 >"$actual" 2>&1

 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"