[Pkg-shadow-commits] r2989 - in debian/trunk/tests/usertools: . 60_userdel_invalid_user 60_userdel_invalid_user/data 61_userdel_del_homedir_with_symlinks

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2009-05-22 11:44:54 +0000 (Fri, 22 May 2009)
New Revision: 2989

Added:
   debian/trunk/tests/usertools/60_userdel_invalid_user/
   debian/trunk/tests/usertools/61_userdel_del_homedir_with_symlinks/
Modified:
   debian/trunk/tests/usertools/60_userdel_invalid_user/data/userdel.err
   debian/trunk/tests/usertools/60_userdel_invalid_user/userdel.test
   debian/trunk/tests/usertools/61_userdel_del_homedir_with_symlinks/userdel.test
Log:
Added tests for userdel.



Property changes on: debian/trunk/tests/usertools/60_userdel_invalid_user
___________________________________________________________________
Added: svn:ignore
   + userdel.test.log


Modified: debian/trunk/tests/usertools/60_userdel_invalid_user/data/userdel.err
===================================================================
--- debian/trunk/tests/usertools/59_userdel_locked_gshadow/data/userdel.err	2009-05-20 21:48:16 UTC (rev 2962)
+++ debian/trunk/tests/usertools/60_userdel_invalid_user/data/userdel.err	2009-05-22 11:44:54 UTC (rev 2989)
@@ -1 +1 @@
-userdel: cannot lock /etc/gshadow; try again later.
+userdel: user 'fooo' does not exist

Modified: debian/trunk/tests/usertools/60_userdel_invalid_user/userdel.test
===================================================================
--- debian/trunk/tests/usertools/59_userdel_locked_gshadow/userdel.test	2009-05-20 21:48:16 UTC (rev 2962)
+++ debian/trunk/tests/usertools/60_userdel_invalid_user/userdel.test	2009-05-22 11:44:54 UTC (rev 2989)
@@ -7,29 +7,23 @@
 . ../../common/config.sh
 . ../../common/log.sh
 
-log_start "$0" "userdel checks if the gshadow file is locked"
+log_start "$0" "userdel checks if the user exists"
 
 save_config
 
 # restore the files on exit
-trap 'log_status "$0" "FAILURE"; restore_config; rm -f /etc/gshadow.lock' 0
+trap 'log_status "$0" "FAILURE"; restore_config' 0
 
 change_config
 
-echo -n "Create lock file for /etc/gshadow..."
-touch /etc/gshadow.lock
-echo "done"
-
-echo -n "Delete user foo (userdel foo)..."
-userdel foo 2>tmp/userdel.err && exit 1 || {
+echo -n "Delete user fooo (userdel fooo)..."
+userdel fooo 2>tmp/userdel.err && exit 1 || {
 	status=$?
 }
 echo "OK"
 
-rm -f /etc/gshadow.lock
-
 echo -n "Check returned status ($status)..."
-test "$status" = "10"
+test "$status" = "6"
 echo "OK"
 
 echo "userdel reported:"

Modified: debian/trunk/tests/usertools/61_userdel_del_homedir_with_symlinks/userdel.test
===================================================================
--- debian/trunk/tests/usertools/09_userdel_del_homedir/userdel.test	2009-05-10 19:36:36 UTC (rev 2906)
+++ debian/trunk/tests/usertools/61_userdel_del_homedir_with_symlinks/userdel.test	2009-05-22 11:44:54 UTC (rev 2989)
@@ -7,19 +7,25 @@
 . ../../common/config.sh
 . ../../common/log.sh
 
-log_start "$0" "userdel can delete the user's home directory"
+log_start "$0" "userdel delete links, but not the pointed file/directory"
 
 save_config
 
 # restore the files on exit
-trap 'log_status "$0" "FAILURE"; restore_config; rm -rf /var/mail/foo /home/foo' 0
+trap 'log_status "$0" "FAILURE"; restore_config' 0
 
 change_config
 
 mkdir /home/foo
+trap 'log_status "$0" "FAILURE"; restore_config; rm -rf /home/foo' 0
+mkdir /home/bar
+trap 'log_status "$0" "FAILURE"; restore_config; rm -rf /home/foo /home/bar' 0
+touch /home/baz
+trap 'log_status "$0" "FAILURE"; restore_config; rm -rf /home/foo /home/bar /home/baz' 0
 echo toto > /home/foo/toto
-touch /var/mail/foo
-chown -R foo:foo /var/mail/foo /home/foo
+ln -s /home/bar /home/foo/bar
+ln -s /home/baz /home/foo/baz
+chown -R foo:foo /home/foo /home/bar /home/baz
 
 echo -n "Delete user foo (userdel -r foo)..."
 userdel -r foo
@@ -40,11 +46,14 @@
 echo -n "Check the user's home directory was removed..."
 test ! -d /home/foo
 echo "OK"
-echo -n "Check the user's mail spool was removed..."
-test ! -f /var/mail/foo
+echo -n "Check that directory pointed from a foo's link is not removed..."
+test -d /home/bar
 echo "OK"
+echo -n "Check that file pointed from a foo's link is not removed..."
+test -f /home/baz
+echo "OK"
+rm -rf /home/bar /home/baz
 
-
 log_status "$0" "SUCCESS"
 restore_config
 trap '' 0