| Message ID | 20211118164940.8818-2-jack@suse.cz (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [01/27] bisect: Fixup test rev-list-bisect/02 | expand |
On Thu, Nov 18, 2021 at 10:38 AM Jan Kara <jack@suse.cz> wrote: > diff --git a/t/t6002-rev-list-bisect.sh b/t/t6002-rev-list-bisect.sh > index b95a0212adff..48db52447fd3 100755 > --- a/t/t6002-rev-list-bisect.sh > +++ b/t/t6002-rev-list-bisect.sh > @@ -247,8 +247,9 @@ test_expect_success 'set up fake --bisect refs' ' > test_expect_success 'rev-list --bisect can default to good/bad refs' ' > # the only thing between c3 and c1 is c2 > git rev-parse c2 >expect && > - git rev-list --bisect >actual && > - test_cmp expect actual > + git rev-parse b2 >>expect && > + actual=$(git rev-list --bisect) && > + grep &>/dev/null $actual expect `&>` is a bashism; you need `>/dev/null 2>&1` here for general portability. Chris ref: https://unix.stackexchange.com/questions/581507/redirecting-stdout-and-stderr-together-vs-redirecting-stdout-and-then-stderr-to/
Hi, On Thu, 18 Nov 2021, Chris Torek wrote: > On Thu, Nov 18, 2021 at 10:38 AM Jan Kara <jack@suse.cz> wrote: > > diff --git a/t/t6002-rev-list-bisect.sh b/t/t6002-rev-list-bisect.sh > > index b95a0212adff..48db52447fd3 100755 > > --- a/t/t6002-rev-list-bisect.sh > > +++ b/t/t6002-rev-list-bisect.sh > > @@ -247,8 +247,9 @@ test_expect_success 'set up fake --bisect refs' ' > > test_expect_success 'rev-list --bisect can default to good/bad refs' ' > > # the only thing between c3 and c1 is c2 > > git rev-parse c2 >expect && > > - git rev-list --bisect >actual && > > - test_cmp expect actual > > + git rev-parse b2 >>expect && > > + actual=$(git rev-list --bisect) && > > + grep &>/dev/null $actual expect > > `&>` is a bashism; you need `>/dev/null 2>&1` here for general portability. More importantly, why do you suppress the output in the first place? This will make debugging breakages harder. Let's just not redirect the output? I do see a more structural problem here, though. Throughout the test suite, it is our custom to generate files called `expect` with what we consider the expected output, and then generate `actual` with the actual output. We then compare the results and complain if they are not identical. With this patch, we break that paradigm. All of a sudden, `expect` is not at all the expected output anymore, but a haystack in which we want to find one thing. And even after reading the commit message twice, I am unconvinced that b2 (whatever that is) might be an equally good choice. I become even more doubtful about that statement when I look at the code comment at the beginning of the test case: # the only thing between c3 and c1 is c2 So either this code comment is wrong, or the patch. And if the code comment is wrong, I would like to know when it became wrong, and how, and why it slipped through our review. Ciao, Dscho
On Fri 19-11-21 17:31:22, Johannes Schindelin wrote: > Hi, > > On Thu, 18 Nov 2021, Chris Torek wrote: > > > On Thu, Nov 18, 2021 at 10:38 AM Jan Kara <jack@suse.cz> wrote: > > > diff --git a/t/t6002-rev-list-bisect.sh b/t/t6002-rev-list-bisect.sh > > > index b95a0212adff..48db52447fd3 100755 > > > --- a/t/t6002-rev-list-bisect.sh > > > +++ b/t/t6002-rev-list-bisect.sh > > > @@ -247,8 +247,9 @@ test_expect_success 'set up fake --bisect refs' ' > > > test_expect_success 'rev-list --bisect can default to good/bad refs' ' > > > # the only thing between c3 and c1 is c2 > > > git rev-parse c2 >expect && > > > - git rev-list --bisect >actual && > > > - test_cmp expect actual > > > + git rev-parse b2 >>expect && > > > + actual=$(git rev-list --bisect) && > > > + grep &>/dev/null $actual expect > > > > `&>` is a bashism; you need `>/dev/null 2>&1` here for general portability. > > More importantly, why do you suppress the output in the first place? This > will make debugging breakages harder. > > Let's just not redirect the output? Sure, I can leave error output alone. I'll do that. > I do see a more structural problem here, though. Throughout the test > suite, it is our custom to generate files called `expect` with what we > consider the expected output, and then generate `actual` with the actual > output. We then compare the results and complain if they are not > identical. A lot of bisection tests do not work like that. Just look through t/t6030-bisect-porcelain.sh for example. I agree that the usage of 'expect' and 'actual' may be misleading after my changes though so I will rename them. > With this patch, we break that paradigm. All of a sudden, `expect` is not > at all the expected output anymore, but a haystack in which we want to > find one thing. > > And even after reading the commit message twice, I am unconvinced that b2 > (whatever that is) might be an equally good choice. I become even more > doubtful about that statement when I look at the code comment at the > beginning of the test case: > > # the only thing between c3 and c1 is c2 > > So either this code comment is wrong, or the patch. And if the code > comment is wrong, I would like to know when it became wrong, and how, and > why it slipped through our review. I agree the comment is confusing but it is more incomplete than outright wrong. I can fix that. The graph operated by this test looks like: b1--b2 \ \ \c1--c2--c3 b1 and c1 are marked as good, c3 is marked as bad. Now b2 & c2 are indeed equivalent bisection choices because after picking any of them we may need one more bisection step to identify the bad commit. The test including the comment was introduced by 03df567fbf6a ("for_each_bisect_ref(): don't trim refnames") but I cannot really comment on why the comment passed review :). IMO because it seems obvious enough... Honza
diff --git a/t/t6002-rev-list-bisect.sh b/t/t6002-rev-list-bisect.sh index b95a0212adff..48db52447fd3 100755 --- a/t/t6002-rev-list-bisect.sh +++ b/t/t6002-rev-list-bisect.sh @@ -247,8 +247,9 @@ test_expect_success 'set up fake --bisect refs' ' test_expect_success 'rev-list --bisect can default to good/bad refs' ' # the only thing between c3 and c1 is c2 git rev-parse c2 >expect && - git rev-list --bisect >actual && - test_cmp expect actual + git rev-parse b2 >>expect && + actual=$(git rev-list --bisect) && + grep &>/dev/null $actual expect ' test_expect_success 'rev-parse --bisect can default to good/bad refs' '
Test 2 from t6002-rev-list-bisect.sh expects 'c2' as the bisection point but b2 is an equivalent choice. Improve the test to accept both. Signed-off-by: Jan Kara <jack@suse.cz> --- t/t6002-rev-list-bisect.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)