X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/db3da5fe01f937010afb1ac4a7129b345f1cf5a2..refs/heads/master:/test/ali/test-ali?ds=inline

diff --git a/test/ali/test-ali b/test/ali/test-ali
index 008782d2..982cff78 100755
--- a/test/ali/test-ali
+++ b/test/ali/test-ali
@@ -19,7 +19,12 @@ fi
 
 setup_test
 
-check_exit '-eq 1' ali - # gcov
+check_exit '-eq 1' ali -
+check_exit '-eq 1' ali -noalias -alias
+check_exit '-eq 1' ali -user
+check_exit '-eq 1' ali -user ''
+check_exit '-eq 1' ali -user 'foo bar'
+check_exit '-eq 0' ali -user foo,bar
 
 expected=$MH_TEST_DIR/$$.expected
 expected_err=$MH_TEST_DIR/$$.expected_err
@@ -28,6 +33,7 @@ actual_err=$MH_TEST_DIR/$$.actual_err
 
 
 # check -help
+start_test "-help"
 cat >$expected <<EOF
 Usage: ali [switches] aliases ...
   switches are:
@@ -40,10 +46,11 @@ Usage: ali [switches] aliases ...
 EOF
 
 #### Skip nmh intro text.
-ali -help | sed '/^$/,$d' >"$actual" 2>&1
+ali -help 2>&1 | sed '/^$/,$d' >"$actual"
 check "$expected" "$actual"
 
 # check -version
+start_test "-version"
 case `ali -v` in
   ali\ --*) ;;
   *       ) echo "$0: ali -v generated unexpected output" 1>&2
@@ -51,12 +58,15 @@ case `ali -v` in
 esac
 
 # check unknown option
+start_test "unknown option"
 run_test 'ali -nonexistent' 'ali: -nonexistent unknown'
 
 # check with no arguments and no AliasFile profile component
+start_test "with no arguments and no AliasFile profile component"
 run_test 'ali' ''
 
 # check with nonexistent alias file
+start_test "with nonexistent alias file"
 run_test 'ali -alias nonexistent' \
          "ali: aliasing error in nonexistent - unable to read 'nonexistent'"
 
@@ -69,6 +79,7 @@ neil: neil@example.com
 EOF
 
 # check -alias
+start_test "-alias"
 run_test "ali -alias ${MH_TEST_DIR}/Mail/aliases" \
          'me: me@example.com
 rush: geddy@example.com, alex@example.com, neil@example.com
@@ -77,14 +88,17 @@ alex: alex@example.com
 neil: neil@example.com'
 
 # check for a specific alias
+start_test "for a specific alias"
 run_test "ali -alias ${MH_TEST_DIR}/Mail/aliases rush" \
          'geddy@example.com, alex@example.com, neil@example.com'
 
 # check for a specific alias that doesn't exist
+start_test "for a specific alias that doesn't exist"
 run_test "ali -alias ${MH_TEST_DIR}/Mail/aliases nonexistent" \
          'nonexistent'
 
 # check -list
+start_test "-list"
 run_test "ali -alias ${MH_TEST_DIR}/Mail/aliases -list" \
          'me: me@example.com
 rush: geddy@example.com
@@ -95,6 +109,7 @@ alex: alex@example.com
 neil: neil@example.com'
 
 # check -nolist, which is the default
+start_test "-nolist, which is the default"
 run_test "ali -alias ${MH_TEST_DIR}/Mail/aliases -list -nolist" \
          'me: me@example.com
 rush: geddy@example.com, alex@example.com, neil@example.com
@@ -103,15 +118,18 @@ alex: alex@example.com
 neil: neil@example.com'
 
 # check -user
+start_test "-user"
 run_test "ali -alias ${MH_TEST_DIR}/Mail/aliases -user geddy@example.com" \
          'rush, geddy'
 
 # check -nouser
+start_test "-nouser"
 run_test \
   "ali -alias ${MH_TEST_DIR}/Mail/aliases -user -nouser geddy@example.com" \
   'geddy@example.com'
 
 # check expansion of first address of blind list [Bug #15604]
+start_test "expansion of first address of blind list [Bug #15604]"
 cat >"${MH_TEST_DIR}/Mail/aliases" <<EOF
 rush: Rush: geddy, alex, neil
 geddy: geddy@example.com
@@ -123,6 +141,7 @@ run_test "ali -alias ${MH_TEST_DIR}/Mail/aliases rush" \
          'Rush: geddy@example.com, alex@example.com, neil@example.com'
 
 # check that aliases followed by ; are not expanded [Bug #15604]
+start_test "that aliases followed by ; are not expanded [Bug #15604]"
 cat >"${MH_TEST_DIR}/Mail/aliases" <<EOF
 rush: Rush: geddy, alex, neil;
 geddy: geddy@example.com
@@ -133,5 +152,5 @@ EOF
 run_test "ali -alias ${MH_TEST_DIR}/Mail/aliases rush" \
          'Rush: geddy@example.com, alex@example.com, neil;'
 
-
+finish_test
 exit $failed