Re: [PATCH 2/2] diff tests: rewrite flakyness-causing test "aid"

>
>
> On Tue, Apr 13 2021, Matheus Tavares Bernardino wrote:
>
> > On Tue, Apr 13, 2021 at 9:31 AM Ævar Arnfjörð Bjarmason
> > <avarab@gmail.com> wrote:
> >>  t/t4013-diff-various.sh | 25 +++++++++++++++----------
> >>  1 file changed, 15 insertions(+), 10 deletions(-)
> >>
> >> diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh
> >> index 67f6411aff9..228ff100c61 100755
> >> --- a/t/t4013-diff-various.sh
> >> +++ b/t/t4013-diff-various.sh
> >> @@ -200,10 +200,12 @@ do
> >>         esac
> >>         test=$(echo "$label" | sed -e 's|[/ ][/ ]*|_|g')
> >>         pfx=$(printf "%04d" $test_count)
> >> -       expect="$TEST_DIRECTORY/t4013/diff.$test"
> >> +       expect_relative="t4013/diff.$test"
> >> +       expect="$TEST_DIRECTORY/$expect_relative"
> >>         actual="$pfx-diff.$test"
> >>
> >>         test_expect_$status "git $cmd # magic is ${magic:-(not used)}" '
> >> +               test_when_finished "rm $actual" &&
> >
> > Nit: before these two patches, "$actual" was only removed when the
> > test succeeded. So, in case of failure, the failed output files would
> > still be there for debugging. It might be interesting to keep this
> > behavior and only remove "$actual" at the end of the test.
>
> Either I'm missing something or you are, that's how test_when_finished
> works.
>
> It's skipped under e.g. "--immediate --debug". See b586744a864 (test:
> skip clean-up when running under --immediate mode, 2011-06-27)