Improve POP SASL error handling

[nmh] / test / mhpath / test-mhpath

diff --git a/test/mhpath/test-mhpath b/test/mhpath/test-mhpath
index 71ee9eaa94b73d35cd7a5f2e04b86b82ad434832..c6521ce3d0181e122641c9a5aadff69b55b76c49 100755 (executable)
--- a/test/mhpath/test-mhpath
+++ b/test/mhpath/test-mhpath
@@ -16,6 +16,8 @@ fi
 
 setup_test
 
 
 setup_test
 

+check_exit '-eq 1' mhpath -
+

 expected=$MH_TEST_DIR/$$.expected
 actual=$MH_TEST_DIR/$$.actual
 
 expected=$MH_TEST_DIR/$$.expected
 actual=$MH_TEST_DIR/$$.actual
 


@@ -27,16 +29,17 @@ Usage: mhpath [+folder] [msgs] [switches]
   -version
   -help
 EOF
   -version
   -help
 EOF

-# The exit status is 1 with -help, so invert it to prevent
-# triggering immediate exit due to set -e.
-! mhpath -help > $actual 2>&1
-check $expected $actual
+
+#### Skip nmh intro text.
+run_prog mhpath -help 2>&1 | sed '/^$/,$d' >"$actual"
+check "$expected" "$actual"

 
 # check -version
 
 # check -version

-if ! mhpath -v | grep '^mhpath --' > /dev/null; then
-  echo "$0: mhpath -v generated unexpected output" 1>&2
-  failed=`expr ${failed:-0} + 1`
-fi
+case `mhpath -v` in
+  mhpath\ --*) ;;
+  *          ) echo "$0: mhpath -v generated unexpected output" 1>&2
+               failed=`expr ${failed:-0} + 1`;;
+esac

 
 # check +
 run_test "mhpath +" "$MH_TEST_DIR/Mail"
 
 # check +
 run_test "mhpath +" "$MH_TEST_DIR/Mail"


@@ -61,7 +64,7 @@ $MH_TEST_DIR/Mail/inbox/8
 $MH_TEST_DIR/Mail/inbox/9
 $MH_TEST_DIR/Mail/inbox/10
 EOF
 $MH_TEST_DIR/Mail/inbox/9
 $MH_TEST_DIR/Mail/inbox/10
 EOF

-mhpath all > $actual 2>&1
+run_prog mhpath all > $actual 2>&1

 check $expected $actual
 
 # check message number greater than highest
 check $expected $actual
 
 # check message number greater than highest


@@ -81,7 +84,7 @@ $MH_TEST_DIR/Mail/inbox/8
 $MH_TEST_DIR/Mail/inbox/9
 $MH_TEST_DIR/Mail/inbox/10
 EOF
 $MH_TEST_DIR/Mail/inbox/9
 $MH_TEST_DIR/Mail/inbox/10
 EOF

-mhpath 1-99999 > $actual 2>&1
+run_prog mhpath 1-99999 > $actual 2>&1

 check $expected $actual
 
 # check new
 check $expected $actual
 
 # check new


@@ -93,7 +96,7 @@ $MH_TEST_DIR/Mail/inbox/1
 $MH_TEST_DIR/Mail/inbox/10
 $MH_TEST_DIR/Mail/inbox/11
 EOF
 $MH_TEST_DIR/Mail/inbox/10
 $MH_TEST_DIR/Mail/inbox/11
 EOF

-mhpath first last new > $actual 2>&1
+run_prog mhpath first last new > $actual 2>&1

 check $expected $actual
 
 # check invalid message list using names
 check $expected $actual
 
 # check invalid message list using names


@@ -124,15 +127,15 @@ cat > $expected <<EOF
 $MH_TEST_DIR/Mail/inbox/3
 $MH_TEST_DIR/Mail/inbox/4
 EOF
 $MH_TEST_DIR/Mail/inbox/3
 $MH_TEST_DIR/Mail/inbox/4
 EOF

-mhpath first:2 > $actual 2>&1
+run_prog mhpath first:2 > $actual 2>&1

 check $expected $actual
 
 check $expected $actual
 

-# check reference to non-existant messages
+# check reference to non-existent messages

 cat > $expected <<EOF
 $MH_TEST_DIR/Mail/inbox/1
 $MH_TEST_DIR/Mail/inbox/2
 EOF
 cat > $expected <<EOF
 $MH_TEST_DIR/Mail/inbox/1
 $MH_TEST_DIR/Mail/inbox/2
 EOF

-mhpath 1 2 > $actual 2>&1
+run_prog mhpath 1 2 > $actual 2>&1

 check $expected $actual
 
 
 check $expected $actual