Moved run_without_input() from test-version-check to common.sh.in.

[nmh] / test / install-mh / test-version-check

diff --git a/test/install-mh/test-version-check b/test/install-mh/test-version-check
index 3dfef0430c667615c1c19fc5961f79f6d6e18563..07188e9ef3f65bdfc763421aaccb85a7074fcfe0 100755 (executable)
--- a/test/install-mh/test-version-check
+++ b/test/install-mh/test-version-check
@@ -16,43 +16,86 @@ fi
 . "${MH_OBJ_DIR}/test/common.sh"
 
 setup_test
 . "${MH_OBJ_DIR}/test/common.sh"
 
 setup_test

+require_runpty_to_simulate_tty

 
 

-require_prog script
-
-actual="$MH_TEST_DIR/test-version-check$$.actual"
+actual="${MH_TEST_DIR}/test-version-check$$.actual"

 context="${MH_TEST_DIR}"/Mail/context
 context="${MH_TEST_DIR}"/Mail/context

+version="Version: nmh-${MH_VERSION}"

 
 

-# Removing Version will trigger the welcome message.
-grep -v Version "$context" > "$context.NEW"
-mv -f "$context.NEW" "$context"
+# Removing Version will trigger the welcome message.  (setup_test
+# inserted it so that other tests wouldn't show it.)
+grep -v Version "${context}" > "${context}.NEW"
+mv -f "${context}.NEW" "${context}"

 
 
 start_test 'mhparam skips the welcome message'
 
 
 start_test 'mhparam skips the welcome message'

-# The command will wait for the user to hit return.  script seems to do what
-# we want by not waiting when run in the background.
-script -c 'mhparam path last' -f -q "$actual" >/dev/null &
-wait $!
-grep 'Welcome to nmh version ' "$actual" >/dev/null  &&  false
-rm "$actual"
-finish_test
+run_without_input "${actual}" mhparam path
+grep 'Welcome to nmh version ' "${actual}" >/dev/null  &&  false
+# Make sure that version wasn't added to context.
+grep "^${version}$" "${MH_TEST_DIR}/Mail/context" >/dev/null  &&  false
+rm "${actual}"
+
+
+start_test 'Welcome: disable in profile skips the welcome message'
+cp "${MH}" "${MH}-welcome"
+printf 'Welcome: disable\n' >> "${MH}-welcome"
+# Run the function in subshell instead of augmenting the environment
+# for a single command, so that the environment does not retain the
+# MH setting.  That can happen when run under distcheck, depending
+# on the user's shell.
+(MH="${MH}-welcome"; run_without_input "${actual}" pick last)
+rm "${MH}-welcome"
+grep 'Welcome to nmh version ' "${actual}" >/dev/null  &&  false
+# Make sure that version wasn't added to context.
+grep "^${version}$" "${MH_TEST_DIR}/Mail/context" >/dev/null  &&  false
+rm "${actual}"

 
 
 start_test 'with welcome message'
 
 
 start_test 'with welcome message'

-script -c 'pick last' -f -q "$actual" >/dev/null &
-wait $!
-grep 'Welcome to nmh version ' "$actual" >/dev/null
-rm "$actual"
-finish_test
+run_without_input "${actual}" pick last
+grep 'Welcome to nmh version ' "${actual}" >/dev/null
+# Make sure that version was added to context.
+grep "^${version}$" "${MH_TEST_DIR}/Mail/context" >/dev/null
+rm "${actual}"

 
 
 start_test 'without welcome message'
 # After running the previous test, this one should not have
 # the welcome message.
 
 
 start_test 'without welcome message'
 # After running the previous test, this one should not have
 # the welcome message.

-script -c 'pick last' -f -q "$actual" >/dev/null &
-wait $!
-grep 'Welcome to nmh version ' "$actual" >/dev/null  &&  false
-rm "$actual"
-finish_test
+run_without_input "${actual}" pick last
+grep 'Welcome to nmh version ' "${actual}" >/dev/null  &&  false
+# Make sure that version is still in context.
+grep "^${version}$" "${MH_TEST_DIR}/Mail/context" >/dev/null
+rm "${actual}"
+

 
 

+start_test 'with MHCONTEXT, welcome only if older'
+MHCONTEXT="${MH_TEST_DIR}/Mail/context2"; export MHCONTEXT
+printf 'Version: nmh-1.5\n' >"${MHCONTEXT}"
+run_without_input "${actual}" pick last
+grep 'Welcome to nmh version ' "${actual}" >/dev/null
+# And make sure that version did get updated in context.
+grep "^${version}$" "${MHCONTEXT}" >/dev/null
+rm "${actual}"

 
 

-exit $failed
+
+start_test "with MHCONTEXT doesn't welcome if newer"
+printf 'Version: nmh-10000.0\n' >"${MHCONTEXT}"
+run_without_input "${actual}" pick last
+grep 'Welcome to nmh version ' "${actual}" >/dev/null  &&  false
+# And make sure that version didn't get updated in context.
+grep '^Version: nmh-10000.0$' "${MHCONTEXT}" >/dev/null
+rm "${actual}"
+
+
+start_test 'with MHCONTEXT but no version, no welcome and update'
+printf '' >"${MHCONTEXT}"
+run_without_input "${actual}" pick last
+grep 'Welcome to nmh version ' "${actual}" >/dev/null  &&  false
+# And make sure that version did get updated in context.
+grep "^${version}$" "${MHCONTEXT}" >/dev/null
+rm "${actual}"
+
+
+finish_test
+exit ${failed}