[Pkg-shadow-commits] r3412 - in debian/trunk/tests/convtools: 06_grpconv_error_group_locked 06_grpconv_error_group_locked/data 07_grpconv_error_gshadow_locked/data 09_grpunconv_error_group_locked/data 10_grpunconv_error_gshadow_locked/data 11_pwconv_error_passwd_locked/data 12_pwconv_error_shadow_locked/data 13_pwunconv_error_passwd_locked/data 14_pwunconv_error_shadow_locked/data

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2011-07-14 17:25:48 +0000 (Thu, 14 Jul 2011)
New Revision: 3412

Modified:
   debian/trunk/tests/convtools/06_grpconv_error_group_locked/data/grpconv.err
   debian/trunk/tests/convtools/06_grpconv_error_group_locked/grpconv.test
   debian/trunk/tests/convtools/07_grpconv_error_gshadow_locked/data/grpconv.err
   debian/trunk/tests/convtools/09_grpunconv_error_group_locked/data/grpunconv.err
   debian/trunk/tests/convtools/10_grpunconv_error_gshadow_locked/data/grpunconv.err
   debian/trunk/tests/convtools/11_pwconv_error_passwd_locked/data/pwconv.err
   debian/trunk/tests/convtools/12_pwconv_error_shadow_locked/data/pwconv.err
   debian/trunk/tests/convtools/13_pwunconv_error_passwd_locked/data/pwunconv.err
   debian/trunk/tests/convtools/14_pwunconv_error_shadow_locked/data/pwunconv.err
Log:
The reason for the lock failure is now indicated in the failure message.


Modified: debian/trunk/tests/convtools/06_grpconv_error_group_locked/data/grpconv.err
===================================================================
--- debian/trunk/tests/convtools/06_grpconv_error_group_locked/data/grpconv.err	2011-07-14 17:22:15 UTC (rev 3411)
+++ debian/trunk/tests/convtools/06_grpconv_error_group_locked/data/grpconv.err	2011-07-14 17:25:48 UTC (rev 3412)
@@ -1 +1,2 @@
+grpconv: lock /etc/group.lock already used by PID <PID>
 grpconv: cannot lock /etc/group; try again later.

Modified: debian/trunk/tests/convtools/06_grpconv_error_group_locked/grpconv.test
===================================================================
--- debian/trunk/tests/convtools/06_grpconv_error_group_locked/grpconv.test	2011-07-14 17:22:15 UTC (rev 3411)
+++ debian/trunk/tests/convtools/06_grpconv_error_group_locked/grpconv.test	2011-07-14 17:25:48 UTC (rev 3412)
@@ -17,7 +17,7 @@
 change_config
 
 echo -n "Create lock file for /etc/group..."
-touch /etc/group.lock
+echo -n $$ > /etc/group.lock
 echo "done"
 
 echo -n "Convert the group files (grpconv)..."
@@ -39,6 +39,7 @@
 cat tmp/grpconv.err
 echo "======================================================================="
 echo -n "Check that there were a failure message..."
+sed -i -e "s/$$/<PID>/" tmp/grpconv.err
 diff -au data/grpconv.err tmp/grpconv.err
 echo "error message OK."
 rm -f tmp/grpconv.err

Modified: debian/trunk/tests/convtools/07_grpconv_error_gshadow_locked/data/grpconv.err
===================================================================
--- debian/trunk/tests/convtools/07_grpconv_error_gshadow_locked/data/grpconv.err	2011-07-14 17:22:15 UTC (rev 3411)
+++ debian/trunk/tests/convtools/07_grpconv_error_gshadow_locked/data/grpconv.err	2011-07-14 17:25:48 UTC (rev 3412)
@@ -1 +1,2 @@
+grpconv: existing lock file /etc/gshadow.lock without a PID
 grpconv: cannot lock /etc/gshadow; try again later.

Modified: debian/trunk/tests/convtools/09_grpunconv_error_group_locked/data/grpunconv.err
===================================================================
--- debian/trunk/tests/convtools/09_grpunconv_error_group_locked/data/grpunconv.err	2011-07-14 17:22:15 UTC (rev 3411)
+++ debian/trunk/tests/convtools/09_grpunconv_error_group_locked/data/grpunconv.err	2011-07-14 17:25:48 UTC (rev 3412)
@@ -1 +1,2 @@
+grpunconv: existing lock file /etc/group.lock without a PID
 grpunconv: cannot lock /etc/group; try again later.

Modified: debian/trunk/tests/convtools/10_grpunconv_error_gshadow_locked/data/grpunconv.err
===================================================================
--- debian/trunk/tests/convtools/10_grpunconv_error_gshadow_locked/data/grpunconv.err	2011-07-14 17:22:15 UTC (rev 3411)
+++ debian/trunk/tests/convtools/10_grpunconv_error_gshadow_locked/data/grpunconv.err	2011-07-14 17:25:48 UTC (rev 3412)
@@ -1 +1,2 @@
+grpunconv: existing lock file /etc/gshadow.lock without a PID
 grpunconv: cannot lock /etc/gshadow; try again later.

Modified: debian/trunk/tests/convtools/11_pwconv_error_passwd_locked/data/pwconv.err
===================================================================
--- debian/trunk/tests/convtools/11_pwconv_error_passwd_locked/data/pwconv.err	2011-07-14 17:22:15 UTC (rev 3411)
+++ debian/trunk/tests/convtools/11_pwconv_error_passwd_locked/data/pwconv.err	2011-07-14 17:25:48 UTC (rev 3412)
@@ -1 +1,2 @@
+pwconv: existing lock file /etc/passwd.lock without a PID
 pwconv: cannot lock /etc/passwd; try again later.

Modified: debian/trunk/tests/convtools/12_pwconv_error_shadow_locked/data/pwconv.err
===================================================================
--- debian/trunk/tests/convtools/12_pwconv_error_shadow_locked/data/pwconv.err	2011-07-14 17:22:15 UTC (rev 3411)
+++ debian/trunk/tests/convtools/12_pwconv_error_shadow_locked/data/pwconv.err	2011-07-14 17:25:48 UTC (rev 3412)
@@ -1 +1,2 @@
+pwconv: existing lock file /etc/shadow.lock without a PID
 pwconv: cannot lock /etc/shadow; try again later.

Modified: debian/trunk/tests/convtools/13_pwunconv_error_passwd_locked/data/pwunconv.err
===================================================================
--- debian/trunk/tests/convtools/13_pwunconv_error_passwd_locked/data/pwunconv.err	2011-07-14 17:22:15 UTC (rev 3411)
+++ debian/trunk/tests/convtools/13_pwunconv_error_passwd_locked/data/pwunconv.err	2011-07-14 17:25:48 UTC (rev 3412)
@@ -1 +1,2 @@
+pwunconv: existing lock file /etc/passwd.lock without a PID
 pwunconv: cannot lock /etc/passwd; try again later.

Modified: debian/trunk/tests/convtools/14_pwunconv_error_shadow_locked/data/pwunconv.err
===================================================================
--- debian/trunk/tests/convtools/14_pwunconv_error_shadow_locked/data/pwunconv.err	2011-07-14 17:22:15 UTC (rev 3411)
+++ debian/trunk/tests/convtools/14_pwunconv_error_shadow_locked/data/pwunconv.err	2011-07-14 17:25:48 UTC (rev 3412)
@@ -1 +1,2 @@
+pwunconv: existing lock file /etc/shadow.lock without a PID
 pwunconv: cannot lock /etc/shadow; try again later.