[Pkg-shadow-commits] r2960 - in debian/trunk/tests: . usertools usertools/55_userdel_busy_user usertools/55_userdel_busy_user/config/etc usertools/55_userdel_busy_user/data usertools/56_userdel_locked_passwd usertools/56_userdel_locked_passwd/data
Nicolas FRANÇOIS
nekral-guest at alioth.debian.org
Wed May 20 21:23:32 UTC 2009
Author: nekral-guest
Date: 2009-05-20 21:23:32 +0000 (Wed, 20 May 2009)
New Revision: 2960
Added:
debian/trunk/tests/usertools/55_userdel_busy_user/
debian/trunk/tests/usertools/56_userdel_locked_passwd/
debian/trunk/tests/usertools/56_userdel_locked_passwd/data/userdel.err
debian/trunk/tests/usertools/56_userdel_locked_passwd/userdel.test
Removed:
debian/trunk/tests/usertools/55_userdel_busy_user/data/group
debian/trunk/tests/usertools/55_userdel_busy_user/data/gshadow
debian/trunk/tests/usertools/55_userdel_busy_user/data/passwd
debian/trunk/tests/usertools/56_userdel_locked_passwd/data/group
debian/trunk/tests/usertools/56_userdel_locked_passwd/data/gshadow
debian/trunk/tests/usertools/56_userdel_locked_passwd/data/home_ls-a
debian/trunk/tests/usertools/56_userdel_locked_passwd/data/passwd
debian/trunk/tests/usertools/56_userdel_locked_passwd/data/shadow
debian/trunk/tests/usertools/56_userdel_locked_passwd/data/usermod.err
debian/trunk/tests/usertools/56_userdel_locked_passwd/usermod.test
Modified:
debian/trunk/tests/run_all
debian/trunk/tests/usertools/55_userdel_busy_user/config/etc/group
debian/trunk/tests/usertools/55_userdel_busy_user/config/etc/gshadow
debian/trunk/tests/usertools/55_userdel_busy_user/config/etc/passwd
debian/trunk/tests/usertools/55_userdel_busy_user/config/etc/shadow
debian/trunk/tests/usertools/55_userdel_busy_user/userdel.test
Log:
Added 2 new userdel tests.
Modified: debian/trunk/tests/run_all
===================================================================
--- debian/trunk/tests/run_all 2009-05-20 21:21:55 UTC (rev 2959)
+++ debian/trunk/tests/run_all 2009-05-20 21:23:32 UTC (rev 2960)
@@ -392,6 +392,8 @@
run_test ./usertools/52_userdel_delete_user_no_shadow_entry/userdel.test
run_test ./usertools/53_userdel_delete_user_no_shadow_file/userdel.test
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
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/55_userdel_busy_user/config/etc/group
===================================================================
--- debian/trunk/tests/usertools/53_userdel_delete_user_no_shadow_file/config/etc/group 2009-05-10 19:36:36 UTC (rev 2906)
+++ debian/trunk/tests/usertools/55_userdel_busy_user/config/etc/group 2009-05-20 21:23:32 UTC (rev 2960)
@@ -40,4 +40,3 @@
crontab:x:101:
Debian-exim:x:102:
foo:x:1000:
-foo2:x:1001:
Modified: debian/trunk/tests/usertools/55_userdel_busy_user/config/etc/gshadow
===================================================================
--- debian/trunk/tests/usertools/53_userdel_delete_user_no_shadow_file/config/etc/gshadow 2009-05-10 19:36:36 UTC (rev 2906)
+++ debian/trunk/tests/usertools/55_userdel_busy_user/config/etc/gshadow 2009-05-20 21:23:32 UTC (rev 2960)
@@ -40,4 +40,3 @@
crontab:x::
Debian-exim:x::
foo:*::
-foo2:*::
Modified: debian/trunk/tests/usertools/55_userdel_busy_user/config/etc/passwd
===================================================================
--- debian/trunk/tests/usertools/53_userdel_delete_user_no_shadow_file/config/etc/passwd 2009-05-10 19:36:36 UTC (rev 2906)
+++ debian/trunk/tests/usertools/55_userdel_busy_user/config/etc/passwd 2009-05-20 21:23:32 UTC (rev 2960)
@@ -17,5 +17,4 @@
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
-foo:x:1000:1000:::/bin/false
-foo2:x:1001:1001:::/bin/false
+foo:x:1000:1000:::/bin/bash
Modified: debian/trunk/tests/usertools/55_userdel_busy_user/config/etc/shadow
===================================================================
--- debian/trunk/tests/usertools/53_userdel_delete_user_no_shadow_file/config/etc/shadow 2009-05-10 19:36:36 UTC (rev 2906)
+++ debian/trunk/tests/usertools/55_userdel_busy_user/config/etc/shadow 2009-05-20 21:23:32 UTC (rev 2960)
@@ -17,5 +17,4 @@
gnats:*:12977:0:99999:7:::
nobody:*:12977:0:99999:7:::
Debian-exim:!:12977:0:99999:7:::
-foo3:!:12977:0:99999:7:::
-foo2:!:12977:0:99999:7:::
+foo:$1$NBLBLIXb$WUgojj1bNuxWEADQGt1m9.:12977:0:99999:7:::
Deleted: debian/trunk/tests/usertools/55_userdel_busy_user/data/group
===================================================================
--- debian/trunk/tests/usertools/53_userdel_delete_user_no_shadow_file/data/group 2009-05-10 19:36:36 UTC (rev 2906)
+++ debian/trunk/tests/usertools/55_userdel_busy_user/data/group 2009-05-20 21:23:32 UTC (rev 2960)
@@ -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:
-foo2:x:1001:
Deleted: debian/trunk/tests/usertools/55_userdel_busy_user/data/gshadow
===================================================================
--- debian/trunk/tests/usertools/53_userdel_delete_user_no_shadow_file/data/gshadow 2009-05-10 19:36:36 UTC (rev 2906)
+++ debian/trunk/tests/usertools/55_userdel_busy_user/data/gshadow 2009-05-20 21:23:32 UTC (rev 2960)
@@ -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::
-foo2:*::
Deleted: debian/trunk/tests/usertools/55_userdel_busy_user/data/passwd
===================================================================
--- debian/trunk/tests/usertools/53_userdel_delete_user_no_shadow_file/data/passwd 2009-05-10 19:36:36 UTC (rev 2906)
+++ debian/trunk/tests/usertools/55_userdel_busy_user/data/passwd 2009-05-20 21:23:32 UTC (rev 2960)
@@ -1,20 +0,0 @@
-root:x:0:0:root:/root:/bin/bash
-daemon:x:1:1:daemon:/usr/sbin:/bin/sh
-bin:x:2:2:bin:/bin:/bin/sh
-sys:x:3:3:sys:/dev:/bin/sh
-sync:x:4:65534:sync:/bin:/bin/sync
-games:x:5:60:games:/usr/games:/bin/sh
-man:x:6:12:man:/var/cache/man:/bin/sh
-lp:x:7:7:lp:/var/spool/lpd:/bin/sh
-mail:x:8:8:mail:/var/mail:/bin/sh
-news:x:9:9:news:/var/spool/news:/bin/sh
-uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh
-proxy:x:13:13:proxy:/bin:/bin/sh
-www-data:x:33:33:www-data:/var/www:/bin/sh
-backup:x:34:34:backup:/var/backups:/bin/sh
-list:x:38:38:Mailing List Manager:/var/list:/bin/sh
-irc:x:39:39:ircd:/var/run/ircd:/bin/sh
-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
-foo2:x:1001:1001:::/bin/false
Modified: debian/trunk/tests/usertools/55_userdel_busy_user/userdel.test
===================================================================
--- debian/trunk/tests/usertools/53_userdel_delete_user_no_shadow_file/userdel.test 2009-05-10 19:36:36 UTC (rev 2906)
+++ debian/trunk/tests/usertools/55_userdel_busy_user/userdel.test 2009-05-20 21:23:32 UTC (rev 2960)
@@ -1,6 +1,6 @@
#!/bin/sh
-set -e
+#set -e
cd $(dirname $0)
@@ -16,25 +16,43 @@
change_config
-echo -n "Delete /etc/shadow..."
-rm -f /etc/shadow
+echo -n "Create a process for foo (su -l foo -c \"sleep 10\")..."
+su -l foo -c "sleep 10" &
echo "OK"
-echo -n "Delete user test1 (userdel foo)..."
-userdel foo
+echo -n "Delete user foo (userdel foo)..."
+userdel foo 2>tmp/userdel.err && exit 1 || {
+ status=$?
+}
echo "OK"
+echo -n "Check returned status ($status)..."
+test "$status" = "8"
+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
+
+kill %1
+wait %1
+
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..."
-test ! -f /etc/shadow
+../../common/compare_file.pl config/etc/gshadow /etc/gshadow
echo "OK"
echo -n "Check the gshadow file..."
-../../common/compare_file.pl data/gshadow /etc/gshadow
+../../common/compare_file.pl config/etc/gshadow /etc/gshadow
echo "OK"
log_status "$0" "SUCCESS"
Deleted: debian/trunk/tests/usertools/56_userdel_locked_passwd/data/group
===================================================================
--- debian/trunk/tests/usertools/24_usermod_locked_passwd/data/group 2009-05-10 19:36:36 UTC (rev 2906)
+++ debian/trunk/tests/usertools/56_userdel_locked_passwd/data/group 2009-05-20 21:23:32 UTC (rev 2960)
@@ -1,42 +0,0 @@
-root:x:0:
-daemon:x:1:
-bin:x:2:
-sys:x:3:root
-adm:x:4:root,foo
-tty:x:5:
-disk:x:6:
-lp:x:7:foo,root
-mail:x:8:
-news:x:9:
-uucp:x:10:
-man:x:12:
-proxy:x:13:
-kmem:x:15:
-dialout:x:20:
-fax:x:21:foo
-voice:x:22:
-cdrom:x:24:
-floppy:x:25:foo
-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:foo
-nogroup:x:65534:
-crontab:x:101:
-Debian-exim:x:102:
-foo:x:1000:
Deleted: debian/trunk/tests/usertools/56_userdel_locked_passwd/data/gshadow
===================================================================
--- debian/trunk/tests/usertools/24_usermod_locked_passwd/data/gshadow 2009-05-10 19:36:36 UTC (rev 2906)
+++ debian/trunk/tests/usertools/56_userdel_locked_passwd/data/gshadow 2009-05-20 21:23:32 UTC (rev 2960)
@@ -1,42 +0,0 @@
-root:*::
-daemon:*::
-bin:*::
-sys:*::root
-adm:*::root,foo
-tty:*::foo
-disk:*:foo:
-lp:*::foo,root
-mail:*::
-news:*::
-uucp:*::
-man:*::
-proxy:*::
-kmem:*::
-dialout:*::
-fax:*:foo:foo
-voice:*::
-cdrom:*:foo:foo
-floppy:*::foo
-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:*::
Deleted: debian/trunk/tests/usertools/56_userdel_locked_passwd/data/home_ls-a
===================================================================
--- debian/trunk/tests/usertools/24_usermod_locked_passwd/data/home_ls-a 2009-05-10 19:36:36 UTC (rev 2906)
+++ debian/trunk/tests/usertools/56_userdel_locked_passwd/data/home_ls-a 2009-05-20 21:23:32 UTC (rev 2960)
@@ -1,3 +0,0 @@
--rw-r--r-- foo:foo `/home/foo2/toto'
-drwxr-xr-x foo:foo `/home/foo2/.'
-drwxr-xr-x root:root `/home/foo2/..'
Deleted: debian/trunk/tests/usertools/56_userdel_locked_passwd/data/passwd
===================================================================
--- debian/trunk/tests/usertools/24_usermod_locked_passwd/data/passwd 2009-05-10 19:36:36 UTC (rev 2906)
+++ debian/trunk/tests/usertools/56_userdel_locked_passwd/data/passwd 2009-05-20 21:23:32 UTC (rev 2960)
@@ -1,20 +0,0 @@
-root:x:0:0:root:/root:/bin/bash
-daemon:x:1:1:daemon:/usr/sbin:/bin/sh
-bin:x:2:2:bin:/bin:/bin/sh
-sys:x:3:3:sys:/dev:/bin/sh
-sync:x:4:65534:sync:/bin:/bin/sync
-games:x:5:60:games:/usr/games:/bin/sh
-man:x:6:12:man:/var/cache/man:/bin/sh
-lp:x:7:7:lp:/var/spool/lpd:/bin/sh
-mail:x:8:8:mail:/var/mail:/bin/sh
-news:x:9:9:news:/var/spool/news:/bin/sh
-uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh
-proxy:x:13:13:proxy:/bin:/bin/sh
-www-data:x:33:33:www-data:/var/www:/bin/sh
-backup:x:34:34:backup:/var/backups:/bin/sh
-list:x:38:38:Mailing List Manager:/var/list:/bin/sh
-irc:x:39:39:ircd:/var/run/ircd:/bin/sh
-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
-foo:x:1000:1000::/home/foo:/bin/false
Deleted: debian/trunk/tests/usertools/56_userdel_locked_passwd/data/shadow
===================================================================
--- debian/trunk/tests/usertools/24_usermod_locked_passwd/data/shadow 2009-05-10 19:36:36 UTC (rev 2906)
+++ debian/trunk/tests/usertools/56_userdel_locked_passwd/data/shadow 2009-05-20 21:23:32 UTC (rev 2960)
@@ -1,20 +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:::
-foo:!:12977:0:99999:7:::
Copied: debian/trunk/tests/usertools/56_userdel_locked_passwd/data/userdel.err (from rev 2906, debian/trunk/tests/usertools/24_usermod_locked_passwd/data/usermod.err)
===================================================================
--- debian/trunk/tests/usertools/56_userdel_locked_passwd/data/userdel.err (rev 0)
+++ debian/trunk/tests/usertools/56_userdel_locked_passwd/data/userdel.err 2009-05-20 21:23:32 UTC (rev 2960)
@@ -0,0 +1 @@
+userdel: cannot lock /etc/passwd; try again later.
Deleted: debian/trunk/tests/usertools/56_userdel_locked_passwd/data/usermod.err
===================================================================
--- debian/trunk/tests/usertools/24_usermod_locked_passwd/data/usermod.err 2009-05-10 19:36:36 UTC (rev 2906)
+++ debian/trunk/tests/usertools/56_userdel_locked_passwd/data/usermod.err 2009-05-20 21:23:32 UTC (rev 2960)
@@ -1 +0,0 @@
-usermod: cannot lock /etc/passwd; try again later.
Copied: debian/trunk/tests/usertools/56_userdel_locked_passwd/userdel.test (from rev 2906, debian/trunk/tests/usertools/24_usermod_locked_passwd/usermod.test)
===================================================================
--- debian/trunk/tests/usertools/56_userdel_locked_passwd/userdel.test (rev 0)
+++ debian/trunk/tests/usertools/56_userdel_locked_passwd/userdel.test 2009-05-20 21:23:32 UTC (rev 2960)
@@ -0,0 +1,60 @@
+#!/bin/sh
+
+set -e
+
+cd $(dirname $0)
+
+. ../../common/config.sh
+. ../../common/log.sh
+
+log_start "$0" "userdel checks if the passwd file is locked"
+
+save_config
+
+# restore the files on exit
+trap 'log_status "$0" "FAILURE"; restore_config; rm -f /etc/passwd.lock' 0
+
+change_config
+
+echo -n "Create lock file for /etc/passwd..."
+touch /etc/passwd.lock
+echo "done"
+
+echo -n "Delete user foo (userdel foo)..."
+userdel foo 2>tmp/userdel.err && exit 1 || {
+ status=$?
+}
+echo "OK"
+
+rm -f /etc/passwd.lock
+
+echo -n "Check returned status ($status)..."
+test "$status" = "1"
+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 config/etc/passwd /etc/passwd
+echo "OK"
+echo -n "Check the group file..."
+../../common/compare_file.pl config/etc/group /etc/group
+echo "OK"
+echo -n "Check the shadow file..."
+../../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
+echo "OK"
+
+log_status "$0" "SUCCESS"
+restore_config
+trap '' 0
+
Deleted: debian/trunk/tests/usertools/56_userdel_locked_passwd/usermod.test
===================================================================
--- debian/trunk/tests/usertools/24_usermod_locked_passwd/usermod.test 2009-05-10 19:36:36 UTC (rev 2906)
+++ debian/trunk/tests/usertools/56_userdel_locked_passwd/usermod.test 2009-05-20 21:23:32 UTC (rev 2960)
@@ -1,60 +0,0 @@
-#!/bin/sh
-
-set -e
-
-cd $(dirname $0)
-
-. ../../common/config.sh
-. ../../common/log.sh
-
-log_start "$0" "usermod -G checks if the passwd file is locked"
-
-save_config
-
-# restore the files on exit
-trap 'log_status "$0" "FAILURE"; restore_config; rm -f /etc/passwd.lock' 0
-
-change_config
-
-echo -n "Create lock file for /etc/passwd..."
-touch /etc/passwd.lock
-echo "done"
-
-echo -n "Change the user's list of supplementary groups (usermod -G bin foo)..."
-usermod -G bin foo 2>tmp/usermod.err && exit 1 || {
- status=$?
-}
-echo "OK"
-
-rm -f /etc/passwd.lock
-
-echo -n "Check returned status ($status)..."
-test "$status" = "1"
-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
-
More information about the Pkg-shadow-commits
mailing list