[Pkg-shadow-commits] r2977 - in debian/trunk/tests/failures: . userdel userdel/01_userdel_gshadow_rename_failure userdel/01_userdel_gshadow_rename_failure/data

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2009-05-21 16:46:43 +0000 (Thu, 21 May 2009)
New Revision: 2977

Added:
   debian/trunk/tests/failures/userdel/
   debian/trunk/tests/failures/userdel/01_userdel_gshadow_rename_failure/
   debian/trunk/tests/failures/userdel/01_userdel_gshadow_rename_failure/data/userdel.err
   debian/trunk/tests/failures/userdel/01_userdel_gshadow_rename_failure/userdel.test
Removed:
   debian/trunk/tests/failures/userdel/01_userdel_gshadow_rename_failure/data/gshadow
   debian/trunk/tests/failures/userdel/01_userdel_gshadow_rename_failure/data/usermod.err
   debian/trunk/tests/failures/userdel/01_userdel_gshadow_rename_failure/usermod.test
Modified:
   debian/trunk/tests/failures/userdel/01_userdel_gshadow_rename_failure/data/group
   debian/trunk/tests/failures/userdel/01_userdel_gshadow_rename_failure/data/passwd
   debian/trunk/tests/failures/userdel/01_userdel_gshadow_rename_failure/data/shadow
Log:
Added an userdel failure test.


Modified: debian/trunk/tests/failures/userdel/01_userdel_gshadow_rename_failure/data/group
===================================================================
--- debian/trunk/tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/data/group	2009-05-10 19:36:36 UTC (rev 2906)
+++ debian/trunk/tests/failures/userdel/01_userdel_gshadow_rename_failure/data/group	2009-05-21 16:46:43 UTC (rev 2977)
@@ -39,4 +39,4 @@
 nogroup:x:65534:
 crontab:x:101:
 Debian-exim:x:102:
-foo:x:1000:bar
+foo:x:1000:

Deleted: debian/trunk/tests/failures/userdel/01_userdel_gshadow_rename_failure/data/gshadow
===================================================================
--- debian/trunk/tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/data/gshadow	2009-05-10 19:36:36 UTC (rev 2906)
+++ debian/trunk/tests/failures/userdel/01_userdel_gshadow_rename_failure/data/gshadow	2009-05-21 16:46:43 UTC (rev 2977)
@@ -1,42 +0,0 @@
-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::
-foo:*::foo

Modified: debian/trunk/tests/failures/userdel/01_userdel_gshadow_rename_failure/data/passwd
===================================================================
--- debian/trunk/tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/data/passwd	2009-05-10 19:36:36 UTC (rev 2906)
+++ debian/trunk/tests/failures/userdel/01_userdel_gshadow_rename_failure/data/passwd	2009-05-21 16:46:43 UTC (rev 2977)
@@ -17,4 +17,3 @@
 gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh
 nobody:x:65534:65534:nobody:/nonexistent:/bin/sh
 Debian-exim:x:102:102::/var/spool/exim4:/bin/false
-bar:x:1000:1000::/home/foo:/bin/false

Modified: debian/trunk/tests/failures/userdel/01_userdel_gshadow_rename_failure/data/shadow
===================================================================
--- debian/trunk/tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/data/shadow	2009-05-10 19:36:36 UTC (rev 2906)
+++ debian/trunk/tests/failures/userdel/01_userdel_gshadow_rename_failure/data/shadow	2009-05-21 16:46:43 UTC (rev 2977)
@@ -17,4 +17,3 @@
 gnats:*:12977:0:99999:7:::
 nobody:*:12977:0:99999:7:::
 Debian-exim:!:12977:0:99999:7:::
-bar:!:12977:0:99999:7:::

Copied: debian/trunk/tests/failures/userdel/01_userdel_gshadow_rename_failure/data/userdel.err (from rev 2906, debian/trunk/tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/data/usermod.err)
===================================================================
--- debian/trunk/tests/failures/userdel/01_userdel_gshadow_rename_failure/data/userdel.err	                        (rev 0)
+++ debian/trunk/tests/failures/userdel/01_userdel_gshadow_rename_failure/data/userdel.err	2009-05-21 16:46:43 UTC (rev 2977)
@@ -0,0 +1,2 @@
+rename FAILURE /etc/gshadow+ /etc/gshadow
+userdel: failure while writing changes to /etc/gshadow

Deleted: debian/trunk/tests/failures/userdel/01_userdel_gshadow_rename_failure/data/usermod.err
===================================================================
--- debian/trunk/tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/data/usermod.err	2009-05-10 19:36:36 UTC (rev 2906)
+++ debian/trunk/tests/failures/userdel/01_userdel_gshadow_rename_failure/data/usermod.err	2009-05-21 16:46:43 UTC (rev 2977)
@@ -1,2 +0,0 @@
-rename FAILURE /etc/gshadow+ /etc/gshadow
-usermod: failure while writing changes to /etc/gshadow

Copied: debian/trunk/tests/failures/userdel/01_userdel_gshadow_rename_failure/userdel.test (from rev 2906, debian/trunk/tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/usermod.test)
===================================================================
--- debian/trunk/tests/failures/userdel/01_userdel_gshadow_rename_failure/userdel.test	                        (rev 0)
+++ debian/trunk/tests/failures/userdel/01_userdel_gshadow_rename_failure/userdel.test	2009-05-21 16:46:43 UTC (rev 2977)
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+set -e
+
+cd $(dirname $0)
+
+. ../../../common/config.sh
+. ../../../common/log.sh
+
+log_start "$0" "userdel reports failure to write /etc/gshadow"
+
+save_config
+
+# restore the files on exit
+trap 'log_status "$0" "FAILURE"; restore_config' 0
+
+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 || {
+	status=$?
+}
+echo "OK"
+
+echo -n "Check returned status ($status)..."
+test "$status" = "10"
+echo "OK"
+
+echo "userdel reported:"
+echo "======================================================================="
+cat tmp/userdel.err
+echo "======================================================================="
+echo -n "Check that there were a failure message..."
+diff -au data/userdel.err tmp/userdel.err
+echo "error message OK."
+rm -f tmp/userdel.err
+
+echo -n "Check the passwd file..."
+../../../common/compare_file.pl data/passwd /etc/passwd
+echo "OK"
+echo -n "Check the group file..."
+../../../common/compare_file.pl data/group /etc/group
+echo "OK"
+echo -n "Check the shadow file..."
+../../../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
+echo "OK"
+
+log_status "$0" "SUCCESS"
+restore_config
+trap '' 0
+

Deleted: debian/trunk/tests/failures/userdel/01_userdel_gshadow_rename_failure/usermod.test
===================================================================
--- debian/trunk/tests/failures/usermod/01_usermod_change_user_name_gshadow_rename_failure/usermod.test	2009-05-10 19:36:36 UTC (rev 2906)
+++ debian/trunk/tests/failures/userdel/01_userdel_gshadow_rename_failure/usermod.test	2009-05-21 16:46:43 UTC (rev 2977)
@@ -1,54 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname $0)
-
-. ../../../common/config.sh
-. ../../../common/log.sh
-
-log_start "$0" "usermod reports failure to write /etc/gshadow"
-
-save_config
-
-# restore the files on exit
-trap 'log_status "$0" "FAILURE"; restore_config' 0
-
-change_config
-
-echo -n "Rename group foo to bar (groupmod -n bar foo)..."
-LD_PRELOAD=../../../common/rename_failure.so FAILURE_PATH=/etc/gshadow usermod -l bar foo 2>tmp/usermod.err && exit 1 || {
-	status=$?
-}
-echo "OK"
-
-echo -n "Check returned status ($status)..."
-test "$status" = "10"
-echo "OK"
-
-echo "usermod reported:"
-echo "======================================================================="
-cat tmp/usermod.err
-echo "======================================================================="
-echo -n "Check that there were a failure message..."
-diff -au data/usermod.err tmp/usermod.err
-echo "error message OK."
-rm -f tmp/usermod.err
-
-echo -n "Check the passwd file..."
-../../../common/compare_file.pl data/passwd /etc/passwd
-echo "OK"
-echo -n "Check the group file..."
-../../../common/compare_file.pl data/group /etc/group
-echo "OK"
-echo -n "Check the shadow file..."
-../../../common/compare_file.pl data/shadow /etc/shadow
-echo "OK"
-echo -n "Check the gshadow file..."
-../../../common/compare_file.pl data/gshadow /etc/gshadow
-echo "OK"
-
-log_status "$0" "SUCCESS"
-restore_config
-trap '' 0
-