From: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
To: Ramkumar Ramachandra <artagnon@gmail.com>
Cc: Git List <git@vger.kernel.org>
Subject: Re: Test failure: Test #3 in t1304-default-acl
Date: Mon, 17 Sep 2012 17:49:40 +0200 [thread overview]
Message-ID: <vpqvcfcps2z.fsf@grenoble-inp.fr> (raw)
In-Reply-To: <CALkWK0=ROz8fxXgnqt-+AthU-hgq_mzFg0GhBQCrAshH_mRBPQ@mail.gmail.com> (Ramkumar Ramachandra's message of "Mon, 17 Sep 2012 08:25:19 -0700")
Ramkumar Ramachandra <artagnon@gmail.com> writes:
> Hi again,
>
> Matthieu Moy wrote:
>> Does this user have the same UID as your usual user
>> (id kseygold; id $LOGNAME)?
>
> Yes. What do you propose we do about the test?
On a GNU system, something like this should do the trick:
--- a/t/t1304-default-acl.sh
+++ b/t/t1304-default-acl.sh
@@ -31,9 +31,9 @@ fi
check_perms_and_acl () {
test -r "$1" &&
- getfacl "$1" > actual &&
+ getfacl --numeric "$1" > actual &&
grep -q "user:root:rwx" actual &&
- grep -q "user:${LOGNAME}:rwx" actual &&
+ grep -q "user:$(id -u):rwx" actual &&
egrep "mask::?r--" actual > /dev/null 2>&1 &&
grep -q "group::---" actual || false
}
but it seems FreeBSD's getfacl doesn't have --numeric
(http://www.unix.com/man-page/FreeBSD/1/getfacl/), so to be portable, we
need some more surgery, like this:
--- a/t/t1304-default-acl.sh
+++ b/t/t1304-default-acl.sh
@@ -33,7 +33,10 @@ check_perms_and_acl () {
test -r "$1" &&
getfacl "$1" > actual &&
grep -q "user:root:rwx" actual &&
- grep -q "user:${LOGNAME}:rwx" actual &&
+ grep "user:.*:rwx" actual | grep -v 'user:root:' | \
+ cut -d : -f 2 | xargs id -u > acl-uid &&
+ id -u > actual-uid &&
+ test_cmp acl-uid actual-uid &&
egrep "mask::?r--" actual > /dev/null 2>&1 &&
grep -q "group::---" actual || false
}
Can you check that this second patch fixes your problem?
I'm a bit hesitant to submit it to git.git, as I find it a bit too
hacky. What do other people think?
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
next prev parent reply other threads:[~2012-09-17 15:49 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-17 14:18 Test failure: Test #3 in t1304-default-acl Ramkumar Ramachandra
2012-09-17 14:26 ` Matthieu Moy
2012-09-17 15:01 ` Ramkumar Ramachandra
2012-09-17 15:23 ` Matthieu Moy
2012-09-17 15:25 ` Ramkumar Ramachandra
2012-09-17 15:49 ` Matthieu Moy [this message]
2012-09-17 16:37 ` Junio C Hamano
2012-09-17 16:52 ` Matthieu Moy
2012-09-17 17:59 ` Joachim Schmitz
2012-09-17 20:35 ` Junio C Hamano
2012-10-01 7:38 ` Ramkumar Ramachandra
2012-10-01 8:08 ` Joachim Schmitz
2012-10-01 16:07 ` Junio C Hamano
2012-09-18 6:19 ` Ramkumar Ramachandra
2012-09-17 15:29 ` Andreas Schwab
2012-09-17 15:32 ` Ramkumar Ramachandra
2012-09-17 17:08 ` Andreas Schwab
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=vpqvcfcps2z.fsf@grenoble-inp.fr \
--to=matthieu.moy@grenoble-inp.fr \
--cc=artagnon@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).