[Pkg-shadow-commits] r2637 - in debian/trunk/tests: . newusers newusers/45_create_user_encrypt_rounds_3000

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2009-04-11 11:36:33 +0000 (Sat, 11 Apr 2009)
New Revision: 2637

Added:
   debian/trunk/tests/newusers/45_create_user_encrypt_rounds_3000/
Modified:
   debian/trunk/tests/newusers/45_create_user_encrypt_rounds_3000/newusers.test
   debian/trunk/tests/run_all
Log:
Added test for newusers.


Modified: debian/trunk/tests/newusers/45_create_user_encrypt_rounds_3000/newusers.test
===================================================================
--- debian/trunk/tests/newusers/43_create_user_encrypt_SHA256_rounds_3000/newusers.test	2009-04-11 11:25:12 UTC (rev 2636)
+++ debian/trunk/tests/newusers/45_create_user_encrypt_rounds_3000/newusers.test	2009-04-11 11:36:33 UTC (rev 2637)
@@ -7,7 +7,7 @@
 . ../../common/config.sh
 . ../../common/log.sh
 
-log_start "$0" "newusers can encrypt the passwords with the SHA256 algorithm and a specified number of rounds"
+log_start "$0" "newusers: the number of rounds cannot be specified without a -c method"
 
 save_config
 
@@ -16,29 +16,36 @@
 
 change_config
 
-echo "newusers -c SHA256 -s 3000 data/newusers.list"
-newusers -c SHA256 -s 3000 data/newusers.list
+echo -n "newusers -s 3000 data/newusers.list ..."
+newusers -s 3000 data/newusers.list 2> tmp/newusers.err && exit 1 || {
+	status=$?
+}
+echo "OK"
 
+echo -n "Check returned status ($status)..."
+test "$status" = "1"
+echo "OK"
+
+echo "newusers reported:"
+echo "======================================================================="
+cat tmp/newusers.err
+echo "======================================================================="
+echo -n "Check that there were a failure message..."
+diff -au data/newusers.err tmp/newusers.err
+echo "error message OK."
+rm -f tmp/newusers.err
+
 echo -n "Check the passwd file..." 
-../../common/compare_file.pl data/passwd /etc/passwd 
+../../common/compare_file.pl config/etc/passwd /etc/passwd 
 echo "OK" 
 echo -n "Check the group file..." 
-../../common/compare_file.pl data/group /etc/group 
+../../common/compare_file.pl config/etc/group /etc/group 
 echo "OK" 
 echo -n "Check the shadow file..." 
-../../common/compare_file.pl data/shadow /etc/shadow 
+../../common/compare_file.pl config/etc/shadow /etc/shadow 
 echo "OK"
-echo -n "Check the number of rounds..."
-rounds=$(sed -n 's/^foo:\$5\$rounds=\([0-9]*\)\$.*$/\1/p' /etc/shadow)
-echo -n "($rounds)..."
-if [ ! "$rounds" = 3000 ]; then
-	echo "Wrong number of rounds"
-	grep "^foo:" /etc/shadow
-	exit 1
-fi
-echo "OK"
 echo -n "Check the gshadow file..." 
-../../common/compare_file.pl data/gshadow /etc/gshadow 
+../../common/compare_file.pl config/etc/gshadow /etc/gshadow 
 echo "OK"
 
 log_status "$0" "SUCCESS"

Modified: debian/trunk/tests/run_all
===================================================================
--- debian/trunk/tests/run_all	2009-04-11 11:25:12 UTC (rev 2636)
+++ debian/trunk/tests/run_all	2009-04-11 11:36:33 UTC (rev 2637)
@@ -506,6 +506,7 @@
 run_test ./newusers/42_create_user_encrypt_SHA512/newusers.test
 run_test ./newusers/43_create_user_encrypt_SHA256_rounds_3000/newusers.test
 run_test ./newusers/44_create_user_encrypt_SHA256_rounds_300/newusers.test
+run_test ./newusers/45_create_user_encrypt_rounds_3000/newusers.test
 run_test ./split_groups/01_useradd_split_group/useradd.test
 run_test ./split_groups/02_useradd_no_split_group/useradd.test
 run_test ./split_groups/03_useradd_split_group_already_split/useradd.test