From 5e45536e261ed590187647c677280d8d12bca3eb Mon Sep 17 00:00:00 2001 From: nekral-guest Date: Sun, 15 Mar 2009 23:13:32 +0000 Subject: [PATCH] Updated since it is not an error. --- .../data/group | 2 +- .../data/groupmod.err | 1 - .../groupmod.test | 21 ++++--------------- 3 files changed, 5 insertions(+), 19 deletions(-) delete mode 100644 tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/data/groupmod.err diff --git a/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/data/group b/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/data/group index fecba0c4..b51c3ad1 100644 --- a/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/data/group +++ b/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/data/group @@ -39,4 +39,4 @@ users:x:100: nogroup:x:65534: crontab:x:101: Debian-exim:x:102: -foo:x:1000: +foo:x:1001: diff --git a/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/data/groupmod.err b/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/data/groupmod.err deleted file mode 100644 index 5e7d27b8..00000000 --- a/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/data/groupmod.err +++ /dev/null @@ -1 +0,0 @@ -groupmod: cannot lock /etc/gshadow; try again later. diff --git a/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/groupmod.test b/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/groupmod.test index 3937c7a1..c4463a38 100755 --- a/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/groupmod.test +++ b/tests/grouptools/groupmod/18_groupmod_change_gid_no_error_locked_gshadow/groupmod.test @@ -7,7 +7,7 @@ cd $(dirname $0) . ../../../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,25 +21,12 @@ touch /etc/gshadow.lock 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 -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 "done" echo -n "Check the passwd file..." ../../../common/compare_file.pl data/passwd /etc/passwd