Fix test.

2011-11-14 20:42:35 +00:00
parent eafbe03cc8
commit d984dcb999
3 changed files with 6 additions and 11 deletions
@@ -0,0 +1,2 @@
+newusers: line 1: invalid line
+newusers: error detected, changes ignored
@@ -1,7 +0,0 @@
-newusers: invalid option -- 'Z'
-Usage: newusers [options]
-
-Options:
-  -h, --help                    display this help message and exit
-  -r, --system                  create system accounts
-
@@ -17,7 +17,7 @@ trap 'log_status "$0" "FAILURE"; restore_config' 0
 change_config

 echo -n "Call newusers with invalid input (newusers data/newusers.list)..."
-newusers data/newusers.list 2>tmp/usage.out && exit 1 || {
+newusers data/newusers.list 2>tmp/newusers.err && exit 1 || {
 	status=$?
 }
 echo "OK"
@@ -28,12 +28,12 @@ echo "OK"

 echo "newusers reported:"
 echo "======================================================================="
-cat tmp/usage.out
+cat tmp/newusers.err
 echo "======================================================================="
 echo -n "Check the usage message..."
-diff -au data/usage.out tmp/usage.out
+diff -au data/newusers.err tmp/newusers.err
 echo "usage message OK."
-rm -f tmp/usage.out
+rm -f tmp/newusers.err

 echo -n "Check the passwd file..."
 ../../common/compare_file.pl config/etc/passwd /etc/passwd