@matheusbsbs / matheus-bagliano / commits / 1767c51787

t/lib-httpd: switch SANITY check for NOT_ROOT

The SANITY prerequisite is really about whether the filesystem will respect the permissions we set, and being root is only one part of that. But the httpd tests really just care about not being root, as they are trying to avoid weirdness in apache (see a1a3011 for details). Let's switch out SANITY for a new NOT_ROOT prerequisite, which will let us tweak SANITY more freely. We implement NOT_ROOT by checking `id -u`, which is in POSIX and seems to be available even on MSYS. Note that we cannot just call this "ROOT" and ask for "!ROOT". The possible outcomes are: 1. we know we are root 2. we know we are not root 3. we could not tell, because `id` was not available We should conservatively treat (3) as "does not have the prerequisite", which means that a naive negation would not work. Helped-by: Kyle J. McKay <mackyle@gmail.com> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed Jan 16, 2015 at 04:16 UTC 1767c51787f2a9aaf99716a48e8928618c1c9481

2 files changed +6 -1

t/lib-httpd.sh

+1 -1

@@ -37,7 +37,7 @@ then

37 test_done

38 fi

40 -if ! test_have_prereq SANITY; then

40 +if ! test_have_prereq NOT_ROOT; then

41 test_skip_or_die $GIT_TEST_HTTPD \

42 "Cannot run httpd tests as root"

43 fi

t/test-lib.sh

@@ -992,6 +992,11 @@ test_lazy_prereq USR_BIN_TIME '

992 test -x /usr/bin/time

993 '

994

995 +test_lazy_prereq NOT_ROOT '

996 + uid=$(id -u) &&

997 + test "$uid" != 0

998 +'

999 +

1000 # When the tests are run as root, permission tests will report that

1001 # things are writable when they shouldn't be.

1002 test -w / || test_set_prereq SANITY