Fri May 22 11:18:07 UTC 2009

Author: nekral-guest
Date: 2009-05-22 11:18:07 +0000 (Fri, 22 May 2009)
New Revision: 2985

Added:
   debian/trunk/tests/failures/userdel/02_userdel_group_rename_failure/
   debian/trunk/tests/failures/userdel/03_userdel_shadow_rename_failure/
   debian/trunk/tests/failures/userdel/04_userdel_passwd_rename_failure/
   debian/trunk/tests/failures/userdel/05_userdel_failure_remove_mailbox/
   debian/trunk/tests/failures/userdel/05_userdel_failure_remove_mailbox/config/var/
   debian/trunk/tests/failures/userdel/05_userdel_failure_remove_mailbox/config/var/mail/
   debian/trunk/tests/failures/userdel/05_userdel_failure_remove_mailbox/config/var/mail/foo
   debian/trunk/tests/failures/userdel/05_userdel_failure_remove_mailbox/data/gshadow
   debian/trunk/tests/failures/userdel/06_userdel_failure_remove_file_homedir/
   debian/trunk/tests/failures/userdel/06_userdel_failure_remove_file_homedir/data/gshadow
   debian/trunk/tests/failures/userdel/07_userdel_failure_remove_homedir/
   debian/trunk/tests/failures/userdel/07_userdel_failure_remove_homedir/data/gshadow
Removed:
   debian/trunk/tests/failures/userdel/02_userdel_group_rename_failure/data/group
   debian/trunk/tests/failures/userdel/03_userdel_shadow_rename_failure/data/group
   debian/trunk/tests/failures/userdel/03_userdel_shadow_rename_failure/data/shadow
Modified:
   debian/trunk/tests/failures/userdel/02_userdel_group_rename_failure/data/userdel.err
   debian/trunk/tests/failures/userdel/02_userdel_group_rename_failure/userdel.test
   debian/trunk/tests/failures/userdel/03_userdel_shadow_rename_failure/data/userdel.err
   debian/trunk/tests/failures/userdel/03_userdel_shadow_rename_failure/userdel.test
   debian/trunk/tests/failures/userdel/04_userdel_passwd_rename_failure/data/userdel.err
   debian/trunk/tests/failures/userdel/04_userdel_passwd_rename_failure/userdel.test
   debian/trunk/tests/failures/userdel/05_userdel_failure_remove_mailbox/data/group
   debian/trunk/tests/failures/userdel/05_userdel_failure_remove_mailbox/data/userdel.err
   debian/trunk/tests/failures/userdel/05_userdel_failure_remove_mailbox/userdel.test
   debian/trunk/tests/failures/userdel/06_userdel_failure_remove_file_homedir/data/group
   debian/trunk/tests/failures/userdel/06_userdel_failure_remove_file_homedir/data/userdel.err
   debian/trunk/tests/failures/userdel/06_userdel_failure_remove_file_homedir/userdel.test
   debian/trunk/tests/failures/userdel/07_userdel_failure_remove_homedir/data/group
   debian/trunk/tests/failures/userdel/07_userdel_failure_remove_homedir/data/userdel.err
   debian/trunk/tests/failures/userdel/07_userdel_failure_remove_homedir/userdel.test
Log:
Added 6 failure tests for userdel.



Property changes on: debian/trunk/tests/failures/userdel/02_userdel_group_rename_failure
___________________________________________________________________
Added: svn:ignore
   + userdel.test.log


Deleted: debian/trunk/tests/failures/userdel/02_userdel_group_rename_failure/data/group
===================================================================

--- debian/trunk/tests/failures/userdel/01_userdel_gshadow_rename_failure/data/group	2009-05-21 16:46:43 UTC (rev 2977)
+++ debian/trunk/tests/failures/userdel/02_userdel_group_rename_failure/data/group	2009-05-22 11:18:07 UTC (rev 2985)
@@ -1,42 +0,0 @@
-root:x:0:
-daemon:x:1:
-bin:x:2:
-sys:x:3:
-adm:x:4:
-tty:x:5:
-disk:x:6:
-lp:x:7:
-mail:x:8:
-news:x:9:
-uucp:x:10:
-man:x:12:
-proxy:x:13:
-kmem:x:15:
-dialout:x:20:
-fax:x:21:
-voice:x:22:
-cdrom:x:24:
-floppy:x:25:
-tape:x:26:
-sudo:x:27:
-audio:x:29:
-dip:x:30:
-www-data:x:33:
-backup:x:34:
-operator:x:37:
-list:x:38:
-irc:x:39:
-src:x:40:
-gnats:x:41:
-shadow:x:42:
-utmp:x:43:
-video:x:44:
-sasl:x:45:
-plugdev:x:46:
-staff:x:50:
-games:x:60:
-users:x:100:
-nogroup:x:65534:
-crontab:x:101:
-Debian-exim:x:102:
-foo:x:1000:

Modified: debian/trunk/tests/failures/userdel/02_userdel_group_rename_failure/data/userdel.err
===================================================================
--- debian/trunk/tests/failures/userdel/01_userdel_gshadow_rename_failure/data/userdel.err	2009-05-21 16:46:43 UTC (rev 2977)
+++ debian/trunk/tests/failures/userdel/02_userdel_group_rename_failure/data/userdel.err	2009-05-22 11:18:07 UTC (rev 2985)
@@ -1,2 +1,2 @@
-rename FAILURE /etc/gshadow+ /etc/gshadow
-userdel: failure while writing changes to /etc/gshadow
+rename FAILURE /etc/group+ /etc/group
+userdel: failure while writing changes to /etc/group

Modified: debian/trunk/tests/failures/userdel/02_userdel_group_rename_failure/userdel.test
===================================================================
--- debian/trunk/tests/failures/userdel/01_userdel_gshadow_rename_failure/userdel.test	2009-05-21 16:46:43 UTC (rev 2977)
+++ debian/trunk/tests/failures/userdel/02_userdel_group_rename_failure/userdel.test	2009-05-22 11:18:07 UTC (rev 2985)
@@ -7,7 +7,7 @@
 . ../../../common/config.sh
 . ../../../common/log.sh
 
-log_start "$0" "userdel reports failure to write /etc/gshadow"
+log_start "$0" "userdel reports failure to write /etc/group"
 
 save_config
 
@@ -17,7 +17,7 @@
 change_config
 
 echo -n "delete group foo (groupdel foo)..."
-LD_PRELOAD=../../../common/rename_failure.so FAILURE_PATH=/etc/gshadow userdel foo 2>tmp/userdel.err && exit 1 || {
+LD_PRELOAD=../../../common/rename_failure.so FAILURE_PATH=/etc/group userdel foo 2>tmp/userdel.err && exit 1 || {
 	status=$?
 }
 echo "OK"
@@ -39,7 +39,7 @@
 ../../../common/compare_file.pl data/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


Property changes on: debian/trunk/tests/failures/userdel/03_userdel_shadow_rename_failure
___________________________________________________________________
Added: svn:ignore
   + userdel.test.log


Deleted: debian/trunk/tests/failures/userdel/03_userdel_shadow_rename_failure/data/group
===================================================================
--- debian/trunk/tests/failures/userdel/01_userdel_gshadow_rename_failure/data/group	2009-05-21 16:46:43 UTC (rev 2977)
+++ debian/trunk/tests/failures/userdel/03_userdel_shadow_rename_failure/data/group	2009-05-22 11:18:07 UTC (rev 2985)
@@ -1,42 +0,0 @@
-root:x:0:
-daemon:x:1:
-bin:x:2:
-sys:x:3:
-adm:x:4:
-tty:x:5:
-disk:x:6:
-lp:x:7:
-mail:x:8:
-news:x:9:
-uucp:x:10:
-man:x:12:
-proxy:x:13:
-kmem:x:15:
-dialout:x:20:
-fax:x:21:
-voice:x:22:
-cdrom:x:24:
-floppy:x:25:
-tape:x:26:
-sudo:x:27:
-audio:x:29:
-dip:x:30:
-www-data:x:33:
-backup:x:34:
-operator:x:37:
-list:x:38:
-irc:x:39:
-src:x:40:
-gnats:x:41:
-shadow:x:42:
-utmp:x:43:
-video:x:44:
-sasl:x:45:
-plugdev:x:46:
-staff:x:50:
-games:x:60:
-users:x:100:
-nogroup:x:65534:
-crontab:x:101:
-Debian-exim:x:102:
-foo:x:1000:

Deleted: debian/trunk/tests/failures/userdel/03_userdel_shadow_rename_failure/data/shadow
===================================================================
--- debian/trunk/tests/failures/userdel/01_userdel_gshadow_rename_failure/data/shadow	2009-05-21 16:46:43 UTC (rev 2977)
+++ debian/trunk/tests/failures/userdel/03_userdel_shadow_rename_failure/data/shadow	2009-05-22 11:18:07 UTC (rev 2985)
@@ -1,19 +0,0 @@
-root:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12991:0:99999:7:::
-daemon:*:12977:0:99999:7:::
-bin:*:12977:0:99999:7:::
-sys:*:12977:0:99999:7:::
-sync:*:12977:0:99999:7:::
-games:*:12977:0:99999:7:::
-man:*:12977:0:99999:7:::
-lp:*:12977:0:99999:7:::
-mail:*:12977:0:99999:7:::
-news:*:12977:0:99999:7:::
-uucp:*:12977:0:99999:7:::
-proxy:*:12977:0:99999:7:::
-www-data:*:12977:0:99999:7:::
-backup:*:12977:0:99999:7:::
-list:*:12977:0:99999:7:::
-irc:*:12977:0:99999:7:::
-gnats:*:12977:0:99999:7:::
-nobody:*:12977:0:99999:7:::
-Debian-exim:!:12977:0:99999:7:::

Modified: debian/trunk/tests/failures/userdel/03_userdel_shadow_rename_failure/data/userdel.err
===================================================================
--- debian/trunk/tests/failures/userdel/01_userdel_gshadow_rename_failure/data/userdel.err	2009-05-21 16:46:43 UTC (rev 2977)
+++ debian/trunk/tests/failures/userdel/03_userdel_shadow_rename_failure/data/userdel.err	2009-05-22 11:18:07 UTC (rev 2985)
@@ -1,2 +1,2 @@
-rename FAILURE /etc/gshadow+ /etc/gshadow
-userdel: failure while writing changes to /etc/gshadow
+rename FAILURE /etc/shadow+ /etc/shadow
+userdel: failure while writing changes to /etc/shadow

Modified: debian/trunk/tests/failures/userdel/03_userdel_shadow_rename_failure/userdel.test
===================================================================
--- debian/trunk/tests/failures/userdel/01_userdel_gshadow_rename_failure/userdel.test	2009-05-21 16:46:43 UTC (rev 2977)
+++ debian/trunk/tests/failures/userdel/03_userdel_shadow_rename_failure/userdel.test	2009-05-22 11:18:07 UTC (rev 2985)
@@ -7,7 +7,7 @@
 . ../../../common/config.sh
 . ../../../common/log.sh
 
-log_start "$0" "userdel reports failure to write /etc/gshadow"
+log_start "$0" "userdel reports failure to write /etc/shadow"
 
 save_config
 
@@ -17,13 +17,13 @@
 change_config
 
 echo -n "delete group foo (groupdel foo)..."
-LD_PRELOAD=../../../common/rename_failure.so FAILURE_PATH=/etc/gshadow userdel foo 2>tmp/userdel.err && exit 1 || {
+LD_PRELOAD=../../../common/rename_failure.so FAILURE_PATH=/etc/shadow userdel foo 2>tmp/userdel.err && exit 1 || {
 	status=$?
 }
 echo "OK"
 
 echo -n "Check returned status ($status)..."
-test "$status" = "10"
+test "$status" = "1"
 echo "OK"
 
 echo "userdel reported:"
@@ -39,10 +39,10 @@
 ../../../common/compare_file.pl data/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 gshadow file..."
 ../../../common/compare_file.pl config/etc/gshadow /etc/gshadow


Property changes on: debian/trunk/tests/failures/userdel/04_userdel_passwd_rename_failure
___________________________________________________________________
Added: svn:ignore
   + userdel.test.log


Modified: debian/trunk/tests/failures/userdel/04_userdel_passwd_rename_failure/data/userdel.err
===================================================================
--- debian/trunk/tests/failures/userdel/01_userdel_gshadow_rename_failure/data/userdel.err	2009-05-21 16:46:43 UTC (rev 2977)
+++ debian/trunk/tests/failures/userdel/04_userdel_passwd_rename_failure/data/userdel.err	2009-05-22 11:18:07 UTC (rev 2985)
@@ -1,2 +1,2 @@
-rename FAILURE /etc/gshadow+ /etc/gshadow
-userdel: failure while writing changes to /etc/gshadow
+rename FAILURE /etc/passwd+ /etc/passwd
+userdel: failure while writing changes to /etc/passwd

Modified: debian/trunk/tests/failures/userdel/04_userdel_passwd_rename_failure/userdel.test
===================================================================
--- debian/trunk/tests/failures/userdel/01_userdel_gshadow_rename_failure/userdel.test	2009-05-21 16:46:43 UTC (rev 2977)
+++ debian/trunk/tests/failures/userdel/04_userdel_passwd_rename_failure/userdel.test	2009-05-22 11:18:07 UTC (rev 2985)
@@ -7,7 +7,7 @@
 . ../../../common/config.sh
 . ../../../common/log.sh
 
-log_start "$0" "userdel reports failure to write /etc/gshadow"
+log_start "$0" "userdel reports failure to write /etc/passwd"
 
 save_config
 
@@ -17,13 +17,13 @@
 change_config
 
 echo -n "delete group foo (groupdel foo)..."
-LD_PRELOAD=../../../common/rename_failure.so FAILURE_PATH=/etc/gshadow userdel foo 2>tmp/userdel.err && exit 1 || {
+LD_PRELOAD=../../../common/rename_failure.so FAILURE_PATH=/etc/passwd userdel foo 2>tmp/userdel.err && exit 1 || {
 	status=$?
 }
 echo "OK"
 
 echo -n "Check returned status ($status)..."
-test "$status" = "10"
+test "$status" = "1"
 echo "OK"
 
 echo "userdel reported:"
@@ -36,13 +36,13 @@
 rm -f tmp/userdel.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 gshadow file..."
 ../../../common/compare_file.pl config/etc/gshadow /etc/gshadow


Property changes on: debian/trunk/tests/failures/userdel/05_userdel_failure_remove_mailbox
___________________________________________________________________
Added: svn:ignore
   + userdel.test.log


Modified: debian/trunk/tests/failures/userdel/05_userdel_failure_remove_mailbox/data/group
===================================================================
--- debian/trunk/tests/failures/userdel/01_userdel_gshadow_rename_failure/data/group	2009-05-21 16:46:43 UTC (rev 2977)
+++ debian/trunk/tests/failures/userdel/05_userdel_failure_remove_mailbox/data/group	2009-05-22 11:18:07 UTC (rev 2985)
@@ -39,4 +39,3 @@
 nogroup:x:65534:
 crontab:x:101:
 Debian-exim:x:102:
-foo:x:1000:

Copied: debian/trunk/tests/failures/userdel/05_userdel_failure_remove_mailbox/data/gshadow (from rev 2977, debian/trunk/tests/failures/userdel/01_userdel_gshadow_rename_failure/config/etc/gshadow)
===================================================================
--- debian/trunk/tests/failures/userdel/05_userdel_failure_remove_mailbox/data/gshadow	                        (rev 0)
+++ debian/trunk/tests/failures/userdel/05_userdel_failure_remove_mailbox/data/gshadow	2009-05-22 11:18:07 UTC (rev 2985)
@@ -0,0 +1,41 @@
+root:*::
+daemon:*::
+bin:*::
+sys:*::
+adm:*::
+tty:*::
+disk:*::
+lp:*::
+mail:*::
+news:*::
+uucp:*::
+man:*::
+proxy:*::
+kmem:*::
+dialout:*::
+fax:*::
+voice:*::
+cdrom:*::
+floppy:*::
+tape:*::
+sudo:*::
+audio:*::
+dip:*::
+www-data:*::
+backup:*::
+operator:*::
+list:*::
+irc:*::
+src:*::
+gnats:*::
+shadow:*::
+utmp:*::
+video:*::
+sasl:*::
+plugdev:*::
+staff:*::
+games:*::
+users:*::
+nogroup:*::
+crontab:x::
+Debian-exim:x::

Modified: debian/trunk/tests/failures/userdel/05_userdel_failure_remove_mailbox/data/userdel.err
===================================================================
--- debian/trunk/tests/failures/userdel/01_userdel_gshadow_rename_failure/data/userdel.err	2009-05-21 16:46:43 UTC (rev 2977)
+++ debian/trunk/tests/failures/userdel/05_userdel_failure_remove_mailbox/data/userdel.err	2009-05-22 11:18:07 UTC (rev 2985)
@@ -1,2 +1,3 @@
-rename FAILURE /etc/gshadow+ /etc/gshadow
-userdel: failure while writing changes to /etc/gshadow
+unlink FAILURE /var/mail/foo
+userdel: warning: can't remove /var/mail/foo: Device or resource busy
+userdel: foo home directory (/home/foo) not found

Modified: debian/trunk/tests/failures/userdel/05_userdel_failure_remove_mailbox/userdel.test
===================================================================
--- debian/trunk/tests/failures/userdel/01_userdel_gshadow_rename_failure/userdel.test	2009-05-21 16:46:43 UTC (rev 2977)
+++ debian/trunk/tests/failures/userdel/05_userdel_failure_remove_mailbox/userdel.test	2009-05-22 11:18:07 UTC (rev 2985)
@@ -7,7 +7,7 @@
 . ../../../common/config.sh
 . ../../../common/log.sh
 
-log_start "$0" "userdel reports failure to write /etc/gshadow"
+log_start "$0" "userdel -r reports failure to remove the mailbox"
 
 save_config
 
@@ -16,14 +16,18 @@
 
 change_config
 
-echo -n "delete group foo (groupdel foo)..."
-LD_PRELOAD=../../../common/rename_failure.so FAILURE_PATH=/etc/gshadow userdel foo 2>tmp/userdel.err && exit 1 || {
+echo -n "Changing ownership of /var/mail/foo..."
+chown foo:mail /var/mail/foo
+echo "OK"
+
+echo -n "delete group foo with its mail spool (groupdel -r foo)..."
+LD_PRELOAD=../../../common/unlink_failure.so FAILURE_PATH=/var/mail/foo userdel -r foo 2>tmp/userdel.err && exit 1 || {
 	status=$?
 }
 echo "OK"
-
+ 
 echo -n "Check returned status ($status)..."
-test "$status" = "10"
+test "$status" = "12"
 echo "OK"
 
 echo "userdel reported:"
@@ -45,7 +49,7 @@
 ../../../common/compare_file.pl data/shadow /etc/shadow
 echo "OK"
 echo -n "Check the gshadow file..."
-../../../common/compare_file.pl config/etc/gshadow /etc/gshadow
+../../../common/compare_file.pl data/gshadow /etc/gshadow
 echo "OK"
 
 log_status "$0" "SUCCESS"


Property changes on: debian/trunk/tests/failures/userdel/06_userdel_failure_remove_file_homedir
___________________________________________________________________
Added: svn:ignore
   + userdel.test.log


Modified: debian/trunk/tests/failures/userdel/06_userdel_failure_remove_file_homedir/data/group
===================================================================
--- debian/trunk/tests/failures/userdel/01_userdel_gshadow_rename_failure/data/group	2009-05-21 16:46:43 UTC (rev 2977)
+++ debian/trunk/tests/failures/userdel/06_userdel_failure_remove_file_homedir/data/group	2009-05-22 11:18:07 UTC (rev 2985)
@@ -39,4 +39,3 @@
 nogroup:x:65534:
 crontab:x:101:
 Debian-exim:x:102:
-foo:x:1000:

Copied: debian/trunk/tests/failures/userdel/06_userdel_failure_remove_file_homedir/data/gshadow (from rev 2977, debian/trunk/tests/failures/userdel/01_userdel_gshadow_rename_failure/config/etc/gshadow)
===================================================================
--- debian/trunk/tests/failures/userdel/06_userdel_failure_remove_file_homedir/data/gshadow	                        (rev 0)
+++ debian/trunk/tests/failures/userdel/06_userdel_failure_remove_file_homedir/data/gshadow	2009-05-22 11:18:07 UTC (rev 2985)
@@ -0,0 +1,41 @@
+root:*::
+daemon:*::
+bin:*::
+sys:*::
+adm:*::
+tty:*::
+disk:*::
+lp:*::
+mail:*::
+news:*::
+uucp:*::
+man:*::
+proxy:*::
+kmem:*::
+dialout:*::
+fax:*::
+voice:*::
+cdrom:*::
+floppy:*::
+tape:*::
+sudo:*::
+audio:*::
+dip:*::
+www-data:*::
+backup:*::
+operator:*::
+list:*::
+irc:*::
+src:*::
+gnats:*::
+shadow:*::
+utmp:*::
+video:*::
+sasl:*::
+plugdev:*::
+staff:*::
+games:*::
+users:*::
+nogroup:*::
+crontab:x::
+Debian-exim:x::

Modified: debian/trunk/tests/failures/userdel/06_userdel_failure_remove_file_homedir/data/userdel.err
===================================================================
--- debian/trunk/tests/failures/userdel/01_userdel_gshadow_rename_failure/data/userdel.err	2009-05-21 16:46:43 UTC (rev 2977)
+++ debian/trunk/tests/failures/userdel/06_userdel_failure_remove_file_homedir/data/userdel.err	2009-05-22 11:18:07 UTC (rev 2985)
@@ -1,2 +1,2 @@
-rename FAILURE /etc/gshadow+ /etc/gshadow
-userdel: failure while writing changes to /etc/gshadow
+unlink FAILURE /home/foo/bar/baz
+userdel: error removing directory /home/foo

Modified: debian/trunk/tests/failures/userdel/06_userdel_failure_remove_file_homedir/userdel.test
===================================================================
--- debian/trunk/tests/failures/userdel/01_userdel_gshadow_rename_failure/userdel.test	2009-05-21 16:46:43 UTC (rev 2977)
+++ debian/trunk/tests/failures/userdel/06_userdel_failure_remove_file_homedir/userdel.test	2009-05-22 11:18:07 UTC (rev 2985)
@@ -7,7 +7,7 @@
 . ../../../common/config.sh
 . ../../../common/log.sh
 
-log_start "$0" "userdel reports failure to write /etc/gshadow"
+log_start "$0" "userdel -r reports failure to remove a file in the home directory"
 
 save_config
 
@@ -16,14 +16,22 @@
 
 change_config
 
-echo -n "delete group foo (groupdel foo)..."
-LD_PRELOAD=../../../common/rename_failure.so FAILURE_PATH=/etc/gshadow userdel foo 2>tmp/userdel.err && exit 1 || {
+echo -n "Create an home directory for foo..."
+mkdir /home/foo
+trap 'log_status "$0" "FAILURE"; restore_config; rm -rf /home/foo' 0
+mkdir /home/foo/bar
+touch /home/foo/bar/baz
+chown -R foo:foo /home/foo
+echo "OK"
+
+echo -n "delete group foo with its mail spool (groupdel -r foo)..."
+LD_PRELOAD=../../../common/unlink_failure.so FAILURE_PATH=/home/foo/bar/baz userdel -r foo 2>tmp/userdel.err && exit 1 || {
 	status=$?
 }
 echo "OK"
-
+ 
 echo -n "Check returned status ($status)..."
-test "$status" = "10"
+test "$status" = "12"
 echo "OK"
 
 echo "userdel reported:"
@@ -35,6 +43,8 @@
 echo "error message OK."
 rm -f tmp/userdel.err
 
+rm -rf /home/foo
+
 echo -n "Check the passwd file..."
 ../../../common/compare_file.pl data/passwd /etc/passwd
 echo "OK"
@@ -45,7 +55,7 @@
 ../../../common/compare_file.pl data/shadow /etc/shadow
 echo "OK"
 echo -n "Check the gshadow file..."
-../../../common/compare_file.pl config/etc/gshadow /etc/gshadow
+../../../common/compare_file.pl data/gshadow /etc/gshadow
 echo "OK"
 
 log_status "$0" "SUCCESS"


Property changes on: debian/trunk/tests/failures/userdel/07_userdel_failure_remove_homedir
___________________________________________________________________
Added: svn:ignore
   + userdel.test.log


Modified: debian/trunk/tests/failures/userdel/07_userdel_failure_remove_homedir/data/group
===================================================================
--- debian/trunk/tests/failures/userdel/01_userdel_gshadow_rename_failure/data/group	2009-05-21 16:46:43 UTC (rev 2977)
+++ debian/trunk/tests/failures/userdel/07_userdel_failure_remove_homedir/data/group	2009-05-22 11:18:07 UTC (rev 2985)
@@ -39,4 +39,3 @@
 nogroup:x:65534:
 crontab:x:101:
 Debian-exim:x:102:
-foo:x:1000:

Copied: debian/trunk/tests/failures/userdel/07_userdel_failure_remove_homedir/data/gshadow (from rev 2977, debian/trunk/tests/failures/userdel/01_userdel_gshadow_rename_failure/config/etc/gshadow)
===================================================================
--- debian/trunk/tests/failures/userdel/07_userdel_failure_remove_homedir/data/gshadow	                        (rev 0)
+++ debian/trunk/tests/failures/userdel/07_userdel_failure_remove_homedir/data/gshadow	2009-05-22 11:18:07 UTC (rev 2985)
@@ -0,0 +1,41 @@
+root:*::
+daemon:*::
+bin:*::
+sys:*::
+adm:*::
+tty:*::
+disk:*::
+lp:*::
+mail:*::
+news:*::
+uucp:*::
+man:*::
+proxy:*::
+kmem:*::
+dialout:*::
+fax:*::
+voice:*::
+cdrom:*::
+floppy:*::
+tape:*::
+sudo:*::
+audio:*::
+dip:*::
+www-data:*::
+backup:*::
+operator:*::
+list:*::
+irc:*::
+src:*::
+gnats:*::
+shadow:*::
+utmp:*::
+video:*::
+sasl:*::
+plugdev:*::
+staff:*::
+games:*::
+users:*::
+nogroup:*::
+crontab:x::
+Debian-exim:x::

Modified: debian/trunk/tests/failures/userdel/07_userdel_failure_remove_homedir/data/userdel.err
===================================================================
--- debian/trunk/tests/failures/userdel/01_userdel_gshadow_rename_failure/data/userdel.err	2009-05-21 16:46:43 UTC (rev 2977)
+++ debian/trunk/tests/failures/userdel/07_userdel_failure_remove_homedir/data/userdel.err	2009-05-22 11:18:07 UTC (rev 2985)
@@ -1,2 +1,2 @@
-rename FAILURE /etc/gshadow+ /etc/gshadow
-userdel: failure while writing changes to /etc/gshadow
+rmdir FAILURE /home/foo
+userdel: error removing directory /home/foo

Modified: debian/trunk/tests/failures/userdel/07_userdel_failure_remove_homedir/userdel.test
===================================================================
--- debian/trunk/tests/failures/userdel/01_userdel_gshadow_rename_failure/userdel.test	2009-05-21 16:46:43 UTC (rev 2977)
+++ debian/trunk/tests/failures/userdel/07_userdel_failure_remove_homedir/userdel.test	2009-05-22 11:18:07 UTC (rev 2985)
@@ -7,7 +7,7 @@
 . ../../../common/config.sh
 . ../../../common/log.sh
 
-log_start "$0" "userdel reports failure to write /etc/gshadow"
+log_start "$0" "userdel -r reports failure to remove the home directory"
 
 save_config
 
@@ -16,14 +16,22 @@
 
 change_config
 
-echo -n "delete group foo (groupdel foo)..."
-LD_PRELOAD=../../../common/rename_failure.so FAILURE_PATH=/etc/gshadow userdel foo 2>tmp/userdel.err && exit 1 || {
+echo -n "Create an home directory for foo..."
+mkdir /home/foo
+trap 'log_status "$0" "FAILURE"; restore_config; rm -rf /home/foo' 0
+mkdir /home/foo/bar
+touch /home/foo/bar/baz
+chown -R foo:foo /home/foo
+echo "OK"
+
+echo -n "delete group foo with its mail spool (groupdel -r foo)..."
+LD_PRELOAD=../../../common/rmdir_failure.so FAILURE_PATH=/home/foo userdel -r foo 2>tmp/userdel.err && exit 1 || {
 	status=$?
 }
 echo "OK"
-
+ 
 echo -n "Check returned status ($status)..."
-test "$status" = "10"
+test "$status" = "12"
 echo "OK"
 
 echo "userdel reported:"
@@ -35,6 +43,8 @@
 echo "error message OK."
 rm -f tmp/userdel.err
 
+rm -rf /home/foo
+
 echo -n "Check the passwd file..."
 ../../../common/compare_file.pl data/passwd /etc/passwd
 echo "OK"
@@ -45,7 +55,7 @@
 ../../../common/compare_file.pl data/shadow /etc/shadow
 echo "OK"
 echo -n "Check the gshadow file..."
-../../../common/compare_file.pl config/etc/gshadow /etc/gshadow
+../../../common/compare_file.pl data/gshadow /etc/gshadow
 echo "OK"
 
 log_status "$0" "SUCCESS"


