[Pkg-shadow-commits] r3401 - in debian/trunk/tests/usertools: 24_usermod_locked_passwd/data 25_usermod-G_locked_group/data 26_usermod_locked_shadow/data 27_usermod-G_locked_gshadow/data 30_usermod-l_locked_group/data 31_usermod-l_locked_gshadow/data 55_userdel_busy_user 55_userdel_busy_user/data 56_userdel_locked_passwd/data 57_userdel_locked_group/data 58_userdel_locked_shadow/data 59_userdel_locked_gshadow/data

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2011-07-14 16:34:53 +0000 (Thu, 14 Jul 2011)
New Revision: 3401

Modified:
   debian/trunk/tests/usertools/24_usermod_locked_passwd/data/usermod.err
   debian/trunk/tests/usertools/25_usermod-G_locked_group/data/usermod.err
   debian/trunk/tests/usertools/26_usermod_locked_shadow/data/usermod.err
   debian/trunk/tests/usertools/27_usermod-G_locked_gshadow/data/usermod.err
   debian/trunk/tests/usertools/30_usermod-l_locked_group/data/usermod.err
   debian/trunk/tests/usertools/31_usermod-l_locked_gshadow/data/usermod.err
   debian/trunk/tests/usertools/55_userdel_busy_user/data/userdel.err
   debian/trunk/tests/usertools/55_userdel_busy_user/userdel.test
   debian/trunk/tests/usertools/56_userdel_locked_passwd/data/userdel.err
   debian/trunk/tests/usertools/57_userdel_locked_group/data/userdel.err
   debian/trunk/tests/usertools/58_userdel_locked_shadow/data/userdel.err
   debian/trunk/tests/usertools/59_userdel_locked_gshadow/data/userdel.err
Log:
Lock failures now receive an extra message.


Modified: debian/trunk/tests/usertools/24_usermod_locked_passwd/data/usermod.err
===================================================================
--- debian/trunk/tests/usertools/24_usermod_locked_passwd/data/usermod.err	2011-07-14 16:24:26 UTC (rev 3400)
+++ debian/trunk/tests/usertools/24_usermod_locked_passwd/data/usermod.err	2011-07-14 16:34:53 UTC (rev 3401)
@@ -1 +1,2 @@
+usermod: existing lock file /etc/passwd.lock without a PID
 usermod: cannot lock /etc/passwd; try again later.

Modified: debian/trunk/tests/usertools/25_usermod-G_locked_group/data/usermod.err
===================================================================
--- debian/trunk/tests/usertools/25_usermod-G_locked_group/data/usermod.err	2011-07-14 16:24:26 UTC (rev 3400)
+++ debian/trunk/tests/usertools/25_usermod-G_locked_group/data/usermod.err	2011-07-14 16:34:53 UTC (rev 3401)
@@ -1 +1,2 @@
+usermod: existing lock file /etc/group.lock without a PID
 usermod: cannot lock /etc/group; try again later.

Modified: debian/trunk/tests/usertools/26_usermod_locked_shadow/data/usermod.err
===================================================================
--- debian/trunk/tests/usertools/26_usermod_locked_shadow/data/usermod.err	2011-07-14 16:24:26 UTC (rev 3400)
+++ debian/trunk/tests/usertools/26_usermod_locked_shadow/data/usermod.err	2011-07-14 16:34:53 UTC (rev 3401)
@@ -1 +1,2 @@
+usermod: existing lock file /etc/shadow.lock without a PID
 usermod: cannot lock /etc/shadow; try again later.

Modified: debian/trunk/tests/usertools/27_usermod-G_locked_gshadow/data/usermod.err
===================================================================
--- debian/trunk/tests/usertools/27_usermod-G_locked_gshadow/data/usermod.err	2011-07-14 16:24:26 UTC (rev 3400)
+++ debian/trunk/tests/usertools/27_usermod-G_locked_gshadow/data/usermod.err	2011-07-14 16:34:53 UTC (rev 3401)
@@ -1 +1,2 @@
+usermod: existing lock file /etc/gshadow.lock without a PID
 usermod: cannot lock /etc/gshadow; try again later.

Modified: debian/trunk/tests/usertools/30_usermod-l_locked_group/data/usermod.err
===================================================================
--- debian/trunk/tests/usertools/30_usermod-l_locked_group/data/usermod.err	2011-07-14 16:24:26 UTC (rev 3400)
+++ debian/trunk/tests/usertools/30_usermod-l_locked_group/data/usermod.err	2011-07-14 16:34:53 UTC (rev 3401)
@@ -1 +1,2 @@
+usermod: existing lock file /etc/group.lock without a PID
 usermod: cannot lock /etc/group; try again later.

Modified: debian/trunk/tests/usertools/31_usermod-l_locked_gshadow/data/usermod.err
===================================================================
--- debian/trunk/tests/usertools/31_usermod-l_locked_gshadow/data/usermod.err	2011-07-14 16:24:26 UTC (rev 3400)
+++ debian/trunk/tests/usertools/31_usermod-l_locked_gshadow/data/usermod.err	2011-07-14 16:34:53 UTC (rev 3401)
@@ -1 +1,2 @@
+usermod: existing lock file /etc/gshadow.lock without a PID
 usermod: cannot lock /etc/gshadow; try again later.

Modified: debian/trunk/tests/usertools/55_userdel_busy_user/data/userdel.err
===================================================================
--- debian/trunk/tests/usertools/55_userdel_busy_user/data/userdel.err	2011-07-14 16:24:26 UTC (rev 3400)
+++ debian/trunk/tests/usertools/55_userdel_busy_user/data/userdel.err	2011-07-14 16:34:53 UTC (rev 3401)
@@ -1 +1 @@
-userdel: user foo is currently logged in
+userdel: user foo is currently used by process <PID>

Modified: debian/trunk/tests/usertools/55_userdel_busy_user/userdel.test
===================================================================
--- debian/trunk/tests/usertools/55_userdel_busy_user/userdel.test	2011-07-14 16:24:26 UTC (rev 3400)
+++ debian/trunk/tests/usertools/55_userdel_busy_user/userdel.test	2011-07-14 16:34:53 UTC (rev 3401)
@@ -40,6 +40,7 @@
 cat tmp/userdel.err
 echo "======================================================================="
 echo -n "Check that there were a failure message..."
+sed -i -e "s/ [0-9]*$/ <PID>/" tmp/userdel.err
 diff -au data/userdel.err tmp/userdel.err
 echo "error message OK."
 rm -f tmp/userdel.err

Modified: debian/trunk/tests/usertools/56_userdel_locked_passwd/data/userdel.err
===================================================================
--- debian/trunk/tests/usertools/56_userdel_locked_passwd/data/userdel.err	2011-07-14 16:24:26 UTC (rev 3400)
+++ debian/trunk/tests/usertools/56_userdel_locked_passwd/data/userdel.err	2011-07-14 16:34:53 UTC (rev 3401)
@@ -1 +1,2 @@
+userdel: existing lock file /etc/passwd.lock without a PID
 userdel: cannot lock /etc/passwd; try again later.

Modified: debian/trunk/tests/usertools/57_userdel_locked_group/data/userdel.err
===================================================================
--- debian/trunk/tests/usertools/57_userdel_locked_group/data/userdel.err	2011-07-14 16:24:26 UTC (rev 3400)
+++ debian/trunk/tests/usertools/57_userdel_locked_group/data/userdel.err	2011-07-14 16:34:53 UTC (rev 3401)
@@ -1 +1,2 @@
+userdel: existing lock file /etc/group.lock without a PID
 userdel: cannot lock /etc/group; try again later.

Modified: debian/trunk/tests/usertools/58_userdel_locked_shadow/data/userdel.err
===================================================================
--- debian/trunk/tests/usertools/58_userdel_locked_shadow/data/userdel.err	2011-07-14 16:24:26 UTC (rev 3400)
+++ debian/trunk/tests/usertools/58_userdel_locked_shadow/data/userdel.err	2011-07-14 16:34:53 UTC (rev 3401)
@@ -1 +1,2 @@
+userdel: existing lock file /etc/shadow.lock without a PID
 userdel: cannot lock /etc/shadow; try again later.

Modified: debian/trunk/tests/usertools/59_userdel_locked_gshadow/data/userdel.err
===================================================================
--- debian/trunk/tests/usertools/59_userdel_locked_gshadow/data/userdel.err	2011-07-14 16:24:26 UTC (rev 3400)
+++ debian/trunk/tests/usertools/59_userdel_locked_gshadow/data/userdel.err	2011-07-14 16:34:53 UTC (rev 3401)
@@ -1 +1,2 @@
+userdel: existing lock file /etc/gshadow.lock without a PID
 userdel: cannot lock /etc/gshadow; try again later.