[Pkg-shadow-commits] r2537 - in debian/trunk/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow: . data

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2009-03-15 23:13:32 +0000 (Sun, 15 Mar 2009)
New Revision: 2537

Removed:
   debian/trunk/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/data/groupmod.err
Modified:
   debian/trunk/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/data/group
   debian/trunk/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/groupmod.test
Log:
Updated since it is not an error.


Modified: debian/trunk/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/data/group
===================================================================
--- debian/trunk/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/data/group	2009-03-15 23:08:40 UTC (rev 2536)
+++ debian/trunk/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/data/group	2009-03-15 23:13:32 UTC (rev 2537)
@@ -39,4 +39,4 @@
 nogroup:x:65534:
 crontab:x:101:
 Debian-exim:x:102:
-foo:x:1000:
+foo:x:1001:

Deleted: debian/trunk/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/data/groupmod.err
===================================================================
--- debian/trunk/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/data/groupmod.err	2009-03-15 23:08:40 UTC (rev 2536)
+++ debian/trunk/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/data/groupmod.err	2009-03-15 23:13:32 UTC (rev 2537)
@@ -1 +0,0 @@
-groupmod: cannot lock /etc/gshadow; try again later.

Modified: debian/trunk/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/groupmod.test
===================================================================
--- debian/trunk/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/groupmod.test	2009-03-15 23:08:40 UTC (rev 2536)
+++ debian/trunk/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/groupmod.test	2009-03-15 23:13:32 UTC (rev 2537)
@@ -7,7 +7,7 @@
 . ../../../common/config.sh
 . ../../../common/log.sh
 
-log_start "$0" "groupmod checks if the gshadow file is locked"
+log_start "$0" "groupmod checks if the gshadow file is locked only if gshadow is changed"
 
 save_config
 
@@ -21,26 +21,13 @@
 echo "done"
 
 echo -n "Change GID of foo to 1001 (groupmod -g 1001 foo)..."
-groupmod -g 1001 foo 2>tmp/groupmod.err && exit || {
-	status=$?
-}
+groupmod -g 1001 foo
 echo "OK"
 
+echo -n "Delete lock file for /etc/gshadow..."
 rm -f /etc/gshadow.lock
+echo "done"
 
-echo -n "Check returned status ($status)..."
-test "$status" = "10"
-echo "OK"
-
-echo "groupmod reported:"
-echo "======================================================================="
-cat tmp/groupmod.err
-echo "======================================================================="
-echo -n "Check that there were a failure message..."
-diff -au data/groupmod.err tmp/groupmod.err
-echo "error message OK."
-rm -f tmp/groupmod.err
-
 echo -n "Check the passwd file..."
 ../../../common/compare_file.pl data/passwd /etc/passwd
 echo "OK"