[Pkg-shadow-commits] r3400 - in debian/trunk/tests/usertools: 01 01/18_userdel_remove_homedir 61_userdel_del_homedir_with_symlinks 61_userdel_del_homedir_with_symlinks/data

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2011-07-14 16:24:26 +0000 (Thu, 14 Jul 2011)
New Revision: 3400

Added:
   debian/trunk/tests/usertools/01/18_userdel_remove_homedir/userdel.err
   debian/trunk/tests/usertools/61_userdel_del_homedir_with_symlinks/data/userdel.err
Modified:
   debian/trunk/tests/usertools/01/18_userdel_remove_homedir.test
   debian/trunk/tests/usertools/01/21_usermod_change_and_move_homedir.test
   debian/trunk/tests/usertools/61_userdel_del_homedir_with_symlinks/userdel.test
Log:
userdel now warns when the user's mail spool cannot be found.


Added: debian/trunk/tests/usertools/01/18_userdel_remove_homedir/userdel.err
===================================================================
--- debian/trunk/tests/usertools/01/18_userdel_remove_homedir/userdel.err	                        (rev 0)
+++ debian/trunk/tests/usertools/01/18_userdel_remove_homedir/userdel.err	2011-07-14 16:24:26 UTC (rev 3400)
@@ -0,0 +1 @@
+userdel: test1 mail spool (/var/mail/test1) not found

Modified: debian/trunk/tests/usertools/01/18_userdel_remove_homedir.test
===================================================================
--- debian/trunk/tests/usertools/01/18_userdel_remove_homedir.test	2011-07-14 16:19:27 UTC (rev 3399)
+++ debian/trunk/tests/usertools/01/18_userdel_remove_homedir.test	2011-07-14 16:24:26 UTC (rev 3400)
@@ -20,7 +20,16 @@
 useradd --create-home test1
 echo "OK"
 echo -n "Delete user test1 with homedir (userdel --remove test1)..."
-userdel --remove test1
+userdel --remove test1 2>tmp/userdel.err
+
+echo "userdel reported:"
+echo "======================================================================="
+cat tmp/userdel.err
+echo "======================================================================="
+echo -n "Check the userdel message..."
+diff -au 18_userdel_remove_homedir/userdel.err tmp/userdel.err
+echo "userdel message OK."
+rm -f tmp/userdel.err
 echo "OK"
 
 echo -n "Check the passwd file..."

Modified: debian/trunk/tests/usertools/01/21_usermod_change_and_move_homedir.test
===================================================================
--- debian/trunk/tests/usertools/01/21_usermod_change_and_move_homedir.test	2011-07-14 16:19:27 UTC (rev 3399)
+++ debian/trunk/tests/usertools/01/21_usermod_change_and_move_homedir.test	2011-07-14 16:24:26 UTC (rev 3400)
@@ -29,9 +29,19 @@
 test ! -d /home/test1
 echo "OK"
 echo -n "Delete user test1 (userdel test1)..."
-userdel test1 --remove
+userdel test1 --remove 2>tmp/userdel.err
 echo "OK"
 
+echo "userdel reported:"
+echo "======================================================================="
+cat tmp/userdel.err
+echo "======================================================================="
+echo -n "Check the userdel message..."
+diff -au 18_userdel_remove_homedir/userdel.err tmp/userdel.err
+echo "userdel message OK."
+rm -f tmp/userdel.err
+echo "OK"
+
 echo -n "Check the passwd file..."
 ../../common/compare_file.pl config/etc/passwd /etc/passwd
 echo "OK"

Added: debian/trunk/tests/usertools/61_userdel_del_homedir_with_symlinks/data/userdel.err
===================================================================
--- debian/trunk/tests/usertools/61_userdel_del_homedir_with_symlinks/data/userdel.err	                        (rev 0)
+++ debian/trunk/tests/usertools/61_userdel_del_homedir_with_symlinks/data/userdel.err	2011-07-14 16:24:26 UTC (rev 3400)
@@ -0,0 +1 @@
+userdel: foo mail spool (/var/mail/foo) not found

Modified: debian/trunk/tests/usertools/61_userdel_del_homedir_with_symlinks/userdel.test
===================================================================
--- debian/trunk/tests/usertools/61_userdel_del_homedir_with_symlinks/userdel.test	2011-07-14 16:19:27 UTC (rev 3399)
+++ debian/trunk/tests/usertools/61_userdel_del_homedir_with_symlinks/userdel.test	2011-07-14 16:24:26 UTC (rev 3400)
@@ -28,9 +28,19 @@
 chown -R foo:foo /home/foo /home/bar /home/baz
 
 echo -n "Delete user foo (userdel -r foo)..."
-userdel -r foo
+userdel -r foo 2>tmp/userdel.err
 echo "OK"
 
+echo "userdel reported:"
+echo "======================================================================="
+cat tmp/userdel.err
+echo "======================================================================="
+echo -n "Check the userdel message..."
+diff -au data/userdel.err tmp/userdel.err
+echo "userdel message OK."
+rm -f tmp/userdel.err
+echo "OK"
+
 echo -n "Check the passwd file..."
 ../../common/compare_file.pl data/passwd /etc/passwd
 echo "OK"