From 5f0f2282d6e00a1de209a04c8270ee6cd8150d8b Mon Sep 17 00:00:00 2001 From: Emmanuel Dreyfus Date: Thu, 6 Nov 2014 14:32:57 +0100 Subject: Regression test portability: batch of bugs (volume 1) Fix various regression test portability in tests/bugs. bug-1004744.t: - Slower systems really requires an increased REBALANCE_TIMEOUT in include.rc bug-1023974.t: - use the -p option to mkdir before the path for portability sake. bug-1051896.t and bug-847622.t: - skip ACL test for NetBSD as it has no POSIX 1e ACL support. bugs-1053579.t: - Override the amount of secondary groups depending of the maximum the system supports. - Specify seq(1) format to avoid having trailing .00 - Use more portable su -m USER -c COMMAND (also in bug-884597.t) - NetBSD does not fail high GID with NFS bug-1058663.c: - Depending on architecture, NetBSD can have SIGSEGV instead of SIGBUS bug-762989.t and bug-867253.t: - For non Linux systems, skip tests on features that are Linux-specific bug-765473.t; - Fix a {1} that bash is supposed to expand in 1 but does not, replace by 1. - Sync volume to make sure it imediatly knows a fd got bad BUG: 1129939 Change-Id: I5405f94ccb8f20d35b3095096b0602c43719a1ae Signed-off-by: Emmanuel Dreyfus Reviewed-on: http://review.gluster.org/9009 Reviewed-by: Xavier Hernandez Tested-by: Gluster Build System Reviewed-by: Kaleb KEITHLEY Reviewed-by: Vijay Bellur --- tests/bugs/bug-1053579.t | 52 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 44 insertions(+), 8 deletions(-) (limited to 'tests/bugs/bug-1053579.t') diff --git a/tests/bugs/bug-1053579.t b/tests/bugs/bug-1053579.t index a736e2de748..11357f71eee 100755 --- a/tests/bugs/bug-1053579.t +++ b/tests/bugs/bug-1053579.t @@ -13,8 +13,24 @@ NEW_GID=1053579 LAST_GID=1053779 NEW_GIDS=${NEW_GID} +# OS-specific overrides +case $OSTYPE in +NetBSD|Darwin) + # only NGROUPS_MAX=16 secondary groups are supported + LAST_GID=1053593 + ;; +FreeBSD) + # NGROUPS_MAX=1023 (FreeBSD>=8.0), we can afford 200 groups + ;; +Linux) + # NGROUPS_MAX=65536, we can afford 200 groups + ;; +*) + ;; +esac + # create a user that belongs to many groups -for GID in $(seq ${NEW_GID} ${LAST_GID}) +for GID in $(seq -f '%6.0f' ${NEW_GID} ${LAST_GID}) do groupadd -o -g ${GID} ${NEW_USER}-${GID} NEW_GIDS="${NEW_GIDS},${NEW_USER}-${GID}" @@ -36,7 +52,7 @@ TEST mount_nfs $H0:/$V0 $N0 nolock TEST glusterfs --volfile-id=/$V0 --volfile-server=$H0 $M0 # the actual test, this used to crash -su -c "stat $N0/. > /dev/null" ${NEW_USER} +su -m ${NEW_USER} -c "stat $N0/. > /dev/null" TEST [ $? -eq 0 ] # create a file that only a user in a high-group can access @@ -44,23 +60,43 @@ echo 'Hello World!' > $N0/README chgrp ${LAST_GID} $N0/README chmod 0640 $N0/README -su -c "cat $N0/README 2>&1 > /dev/null" ${NEW_USER} -TEST [ $? -ne 0 ] +#su -m ${NEW_USER} -c "cat $N0/README 2>&1 > /dev/null" +su -m ${NEW_USER} -c "cat $N0/README" +ret=$? + +case $OSTYPE in +Linux) # Linux NFS fails with big GID + if [ $ret -ne 0 ] ; then + res="Y" + else + res="N" + fi + ;; +*) # Other systems should cope better + if [ $ret -eq 0 ] ; then + res="Y" + else + res="N" + fi + ;; +esac +TEST [ "x$res" = "xY" ] + # This passes only on build.gluster.org, not reproducible on other machines?! -#su -c "cat $M0/README 2>&1 > /dev/null" ${NEW_USER} +#su -m ${NEW_USER} -c "cat $M0/README 2>&1 > /dev/null" #TEST [ $? -ne 0 ] # enable server.manage-gids and things should work TEST $CLI volume set $V0 server.manage-gids on -su -c "cat $N0/README 2>&1 > /dev/null" ${NEW_USER} +su -m ${NEW_USER} -c "cat $N0/README 2>&1 > /dev/null" TEST [ $? -eq 0 ] -su -c "cat $M0/README 2>&1 > /dev/null" ${NEW_USER} +su -m ${NEW_USER} -c "cat $M0/README 2>&1 > /dev/null" TEST [ $? -eq 0 ] # cleanup userdel --force ${NEW_USER} -for GID in $(seq ${NEW_GID} ${LAST_GID}) +for GID in $(seq -f '%6.0f' ${NEW_GID} ${LAST_GID}) do groupdel ${NEW_USER}-${GID} done -- cgit