| Message ID | fb1905dab09a7e9d9d8952da56d90aaba2403a57.1476181339.git.bcodding@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Oct 11, 2016 at 06:26:38AM -0400, Benjamin Coddington wrote: > The grep for $qa_user_id can return more than one entry. > > Signed-off-by: Benjamin Coddington <bcodding@redhat.com> > --- > tests/generic/317 | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tests/generic/317 b/tests/generic/317 > index 9d9499ba04dd..ddaa6b59afc5 100755 > --- a/tests/generic/317 > +++ b/tests/generic/317 > @@ -61,7 +61,7 @@ _require_scratch > _require_user > _require_ugid_map > _require_userns > -qa_user_id=`grep $qa_user /etc/passwd |awk -F: '{print $3}'` > +qa_user_id=`grep ^${qa_user}: /etc/passwd |awk -F: '{print $3}'` Hi Ben, I have a patch[1] to fix this too (in a different way), and it's in my last pull request[2] to Dave, though he hasn't pushed them to upstream yet. Does it work for you? Thanks, Eryu [1] http://www.spinics.net/lists/fstests/msg03977.html [2] http://www.spinics.net/lists/fstests/msg04095.html > > _filter_output() > { > -- > 2.5.5 > > -- > To unsubscribe from this list: send the line "unsubscribe fstests" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe fstests" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 11 Oct 2016, at 6:42, Eryu Guan wrote: > On Tue, Oct 11, 2016 at 06:26:38AM -0400, Benjamin Coddington wrote: >> The grep for $qa_user_id can return more than one entry. >> >> Signed-off-by: Benjamin Coddington <bcodding@redhat.com> >> --- >> tests/generic/317 | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/tests/generic/317 b/tests/generic/317 >> index 9d9499ba04dd..ddaa6b59afc5 100755 >> --- a/tests/generic/317 >> +++ b/tests/generic/317 >> @@ -61,7 +61,7 @@ _require_scratch >> _require_user >> _require_ugid_map >> _require_userns >> -qa_user_id=`grep $qa_user /etc/passwd |awk -F: '{print $3}'` >> +qa_user_id=`grep ^${qa_user}: /etc/passwd |awk -F: '{print $3}'` > > Hi Ben, > > I have a patch[1] to fix this too (in a different way), and it's in my > last pull request[2] to Dave, though he hasn't pushed them to upstream > yet. Does it work for you? Yes, that'll work. Sorry for missing it. Ben -- To unsubscribe from this list: send the line "unsubscribe fstests" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/tests/generic/317 b/tests/generic/317 index 9d9499ba04dd..ddaa6b59afc5 100755 --- a/tests/generic/317 +++ b/tests/generic/317 @@ -61,7 +61,7 @@ _require_scratch _require_user _require_ugid_map _require_userns -qa_user_id=`grep $qa_user /etc/passwd |awk -F: '{print $3}'` +qa_user_id=`grep ^${qa_user}: /etc/passwd |awk -F: '{print $3}'` _filter_output() {
The grep for $qa_user_id can return more than one entry. Signed-off-by: Benjamin Coddington <bcodding@redhat.com> --- tests/generic/317 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)