[Pkg-shadow-commits] r3613 - in debian/trunk/tests/newusers/58_invalid_input_file: . data

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2011-11-14 20:42:35 +0000 (Mon, 14 Nov 2011)
New Revision: 3613

Added:
   debian/trunk/tests/newusers/58_invalid_input_file/data/newusers.err
Removed:
   debian/trunk/tests/newusers/58_invalid_input_file/data/usage.out
Modified:
   debian/trunk/tests/newusers/58_invalid_input_file/newusers.test
Log:
Fix test.


Added: debian/trunk/tests/newusers/58_invalid_input_file/data/newusers.err
===================================================================
--- debian/trunk/tests/newusers/58_invalid_input_file/data/newusers.err	                        (rev 0)
+++ debian/trunk/tests/newusers/58_invalid_input_file/data/newusers.err	2011-11-14 20:42:35 UTC (rev 3613)
@@ -0,0 +1,2 @@
+newusers: line 1: invalid line
+newusers: error detected, changes ignored

Deleted: debian/trunk/tests/newusers/58_invalid_input_file/data/usage.out
===================================================================
--- debian/trunk/tests/newusers/58_invalid_input_file/data/usage.out	2011-11-14 20:39:28 UTC (rev 3612)
+++ debian/trunk/tests/newusers/58_invalid_input_file/data/usage.out	2011-11-14 20:42:35 UTC (rev 3613)
@@ -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
-

Modified: debian/trunk/tests/newusers/58_invalid_input_file/newusers.test
===================================================================
--- debian/trunk/tests/newusers/58_invalid_input_file/newusers.test	2011-11-14 20:39:28 UTC (rev 3612)
+++ debian/trunk/tests/newusers/58_invalid_input_file/newusers.test	2011-11-14 20:42:35 UTC (rev 3613)
@@ -17,7 +17,7 @@
 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 "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