[Pkg-shadow-commits] r2962 - in debian/trunk/tests: . usertools usertools/57_userdel_locked_group usertools/57_userdel_locked_group/data usertools/58_userdel_locked_shadow usertools/58_userdel_locked_shadow/data usertools/59_userdel_locked_gshadow usertools/59_userdel_locked_gshadow/data

Nicolas FRANÇOIS nekral-guest at alioth.debian.org
Wed May 20 21:48:16 UTC 2009


Author: nekral-guest
Date: 2009-05-20 21:48:16 +0000 (Wed, 20 May 2009)
New Revision: 2962

Added:
   debian/trunk/tests/usertools/57_userdel_locked_group/
   debian/trunk/tests/usertools/58_userdel_locked_shadow/
   debian/trunk/tests/usertools/59_userdel_locked_gshadow/
Modified:
   debian/trunk/tests/run_all
   debian/trunk/tests/usertools/57_userdel_locked_group/data/userdel.err
   debian/trunk/tests/usertools/57_userdel_locked_group/userdel.test
   debian/trunk/tests/usertools/58_userdel_locked_shadow/data/userdel.err
   debian/trunk/tests/usertools/58_userdel_locked_shadow/userdel.test
   debian/trunk/tests/usertools/59_userdel_locked_gshadow/data/userdel.err
   debian/trunk/tests/usertools/59_userdel_locked_gshadow/userdel.test
Log:
Added 3 tests for userdel.


Modified: debian/trunk/tests/run_all
===================================================================
--- debian/trunk/tests/run_all	2009-05-20 21:44:52 UTC (rev 2961)
+++ debian/trunk/tests/run_all	2009-05-20 21:48:16 UTC (rev 2962)
@@ -394,6 +394,9 @@
 run_test ./usertools/54_usermod-u_invalid_UID_4294967295/usermod.test
 run_test ./usertools/55_userdel_busy_user/userdel.test
 run_test ./usertools/56_userdel_locked_passwd/userdel.test
+run_test ./usertools/57_userdel_locked_group/userdel.test
+run_test ./usertools/58_userdel_locked_shadow/userdel.test
+run_test ./usertools/59_userdel_locked_gshadow/userdel.test
 if [ "$USE_PAM" = "yes" ]; then
 	run_test ./usertools/chpasswd-PAM/01_chpasswd_invalid_user/chpasswd.test
 	run_test ./usertools/chpasswd-PAM/02_chpasswd_multiple_users/chpasswd.test

Modified: debian/trunk/tests/usertools/57_userdel_locked_group/data/userdel.err
===================================================================
--- debian/trunk/tests/usertools/56_userdel_locked_passwd/data/userdel.err	2009-05-20 21:23:32 UTC (rev 2960)
+++ debian/trunk/tests/usertools/57_userdel_locked_group/data/userdel.err	2009-05-20 21:48:16 UTC (rev 2962)
@@ -1 +1 @@
-userdel: cannot lock /etc/passwd; try again later.
+userdel: cannot lock /etc/group; try again later.

Modified: debian/trunk/tests/usertools/57_userdel_locked_group/userdel.test
===================================================================
--- debian/trunk/tests/usertools/56_userdel_locked_passwd/userdel.test	2009-05-20 21:23:32 UTC (rev 2960)
+++ debian/trunk/tests/usertools/57_userdel_locked_group/userdel.test	2009-05-20 21:48:16 UTC (rev 2962)
@@ -7,17 +7,17 @@
 . ../../common/config.sh
 . ../../common/log.sh
 
-log_start "$0" "userdel checks if the passwd file is locked"
+log_start "$0" "userdel checks if the group file is locked"
 
 save_config
 
 # restore the files on exit
-trap 'log_status "$0" "FAILURE"; restore_config; rm -f /etc/passwd.lock' 0
+trap 'log_status "$0" "FAILURE"; restore_config; rm -f /etc/group.lock' 0
 
 change_config
 
-echo -n "Create lock file for /etc/passwd..."
-touch /etc/passwd.lock
+echo -n "Create lock file for /etc/group..."
+touch /etc/group.lock
 echo "done"
 
 echo -n "Delete user foo (userdel foo)..."
@@ -26,10 +26,10 @@
 }
 echo "OK"
 
-rm -f /etc/passwd.lock
+rm -f /etc/group.lock
 
 echo -n "Check returned status ($status)..."
-test "$status" = "1"
+test "$status" = "10"
 echo "OK"
 
 echo "userdel reported:"

Modified: debian/trunk/tests/usertools/58_userdel_locked_shadow/data/userdel.err
===================================================================
--- debian/trunk/tests/usertools/56_userdel_locked_passwd/data/userdel.err	2009-05-20 21:23:32 UTC (rev 2960)
+++ debian/trunk/tests/usertools/58_userdel_locked_shadow/data/userdel.err	2009-05-20 21:48:16 UTC (rev 2962)
@@ -1 +1 @@
-userdel: cannot lock /etc/passwd; try again later.
+userdel: cannot lock /etc/shadow; try again later.

Modified: debian/trunk/tests/usertools/58_userdel_locked_shadow/userdel.test
===================================================================
--- debian/trunk/tests/usertools/56_userdel_locked_passwd/userdel.test	2009-05-20 21:23:32 UTC (rev 2960)
+++ debian/trunk/tests/usertools/58_userdel_locked_shadow/userdel.test	2009-05-20 21:48:16 UTC (rev 2962)
@@ -7,17 +7,17 @@
 . ../../common/config.sh
 . ../../common/log.sh
 
-log_start "$0" "userdel checks if the passwd file is locked"
+log_start "$0" "userdel checks if the shadow file is locked"
 
 save_config
 
 # restore the files on exit
-trap 'log_status "$0" "FAILURE"; restore_config; rm -f /etc/passwd.lock' 0
+trap 'log_status "$0" "FAILURE"; restore_config; rm -f /etc/shadow.lock' 0
 
 change_config
 
-echo -n "Create lock file for /etc/passwd..."
-touch /etc/passwd.lock
+echo -n "Create lock file for /etc/shadow..."
+touch /etc/shadow.lock
 echo "done"
 
 echo -n "Delete user foo (userdel foo)..."
@@ -26,7 +26,7 @@
 }
 echo "OK"
 
-rm -f /etc/passwd.lock
+rm -f /etc/shadow.lock
 
 echo -n "Check returned status ($status)..."
 test "$status" = "1"

Modified: debian/trunk/tests/usertools/59_userdel_locked_gshadow/data/userdel.err
===================================================================
--- debian/trunk/tests/usertools/56_userdel_locked_passwd/data/userdel.err	2009-05-20 21:23:32 UTC (rev 2960)
+++ debian/trunk/tests/usertools/59_userdel_locked_gshadow/data/userdel.err	2009-05-20 21:48:16 UTC (rev 2962)
@@ -1 +1 @@
-userdel: cannot lock /etc/passwd; try again later.
+userdel: cannot lock /etc/gshadow; try again later.

Modified: debian/trunk/tests/usertools/59_userdel_locked_gshadow/userdel.test
===================================================================
--- debian/trunk/tests/usertools/56_userdel_locked_passwd/userdel.test	2009-05-20 21:23:32 UTC (rev 2960)
+++ debian/trunk/tests/usertools/59_userdel_locked_gshadow/userdel.test	2009-05-20 21:48:16 UTC (rev 2962)
@@ -7,17 +7,17 @@
 . ../../common/config.sh
 . ../../common/log.sh
 
-log_start "$0" "userdel checks if the passwd file is locked"
+log_start "$0" "userdel checks if the gshadow file is locked"
 
 save_config
 
 # restore the files on exit
-trap 'log_status "$0" "FAILURE"; restore_config; rm -f /etc/passwd.lock' 0
+trap 'log_status "$0" "FAILURE"; restore_config; rm -f /etc/gshadow.lock' 0
 
 change_config
 
-echo -n "Create lock file for /etc/passwd..."
-touch /etc/passwd.lock
+echo -n "Create lock file for /etc/gshadow..."
+touch /etc/gshadow.lock
 echo "done"
 
 echo -n "Delete user foo (userdel foo)..."
@@ -26,10 +26,10 @@
 }
 echo "OK"
 
-rm -f /etc/passwd.lock
+rm -f /etc/gshadow.lock
 
 echo -n "Check returned status ($status)..."
-test "$status" = "1"
+test "$status" = "10"
 echo "OK"
 
 echo "userdel reported:"




More information about the Pkg-shadow-commits mailing list