summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiuseppe Scrivano <gscrivano@gnu.org>2009-07-04 10:14:31 +0200
committerJim Meyering <meyering@redhat.com>2009-07-04 10:47:56 +0200
commit42cd6653b06e63fc36ef3f105fd37de036012e05 (patch)
treeb6de412c8a658a89da1183a148c02f1e26b28e77
parent065ce2436150a59ff9c6a2215e1651faf982ab2c (diff)
downloadcoreutils-42cd6653b06e63fc36ef3f105fd37de036012e05.tar.xz
tests: use the "nobody" user's group as the default group id
* tests/chroot/credentials: Use the group id, not its name. * tests/test-lib.sh (NON_ROOT_GROUP): Use the "nobody" user's group in place of "nogroup".
-rwxr-xr-xtests/chroot/credentials2
-rw-r--r--tests/test-lib.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/chroot/credentials b/tests/chroot/credentials
index 58c098f53..f200f14ab 100755
--- a/tests/chroot/credentials
+++ b/tests/chroot/credentials
@@ -37,7 +37,7 @@ test "$(chroot --userspec=$NON_ROOT_USERNAME:$NON_ROOT_GROUP / whoami)" != root
|| fail=1
# Verify that there are no additional groups.
-test "$(chroot --userspec=$NON_ROOT_USERNAME:$NON_ROOT_GROUP --groups=$NON_ROOT_GROUP / id -nG)"\
+test "$(chroot --userspec=$NON_ROOT_USERNAME:$NON_ROOT_GROUP --groups=$NON_ROOT_GROUP / id -G)"\
= $NON_ROOT_GROUP || fail=1
# Verify that when specifying only the user name we get the current
diff --git a/tests/test-lib.sh b/tests/test-lib.sh
index d99e3a966..9797b552e 100644
--- a/tests/test-lib.sh
+++ b/tests/test-lib.sh
@@ -209,7 +209,7 @@ require_root_()
{
uid_is_privileged_ || skip_test_ "must be run as root"
NON_ROOT_USERNAME=${NON_ROOT_USERNAME=nobody}
- NON_ROOT_GROUP=${NON_ROOT_GROUP=nobody}
+ NON_ROOT_GROUP=${NON_ROOT_GROUP=$(id -g $NON_ROOT_USERNAME)}
}
skip_if_root_() { uid_is_privileged_ && skip_test_ "must be run as non-root"; }