Re: [PATCH v2 1/3] t4254: merge 2 steps of a single test
- From
Danh Doan <congdanhqx@gmail.com>
- Date
- Apr 19, 2020, 14:17 UTC
- Message-ID
- <20200419141754.GB28207@danh.dev>
- In-Reply-To
- <CAN0heSqnKfepx1c-7Exy1bj3_p_JdAuBLyt5WtkwZCSkOuroMg@mail.gmail.com>
On 2020-04-19 14:25:41+0200, Martin Ågren <martin.agren@gmail.com> wrote:
Show 5 quoted lines
> On Sun, 19 Apr 2020 at 13:03, Đoàn Trần Công Danh <congdanhqx@gmail.com> wrote: > > # fatal: unable to write file '(null)' mode 100644: Bad address > > # Also, it had the unwanted side-effect of deleting f. > > (This comment looks a bit unnecessary, but that's not new.)
I haven't looked very hard into this part, I guess I could take more time to look at it and decide if we should remove it or not.
Show 14 quoted lines
> > test_expect_success 'try to apply corrupted patch' ' > > - test_must_fail git -c advice.amWorkDir=false am bad-patch.diff 2>actual > > -' > > - > > -test_expect_success 'compare diagnostic; ensure file is still here' ' > > + test_when_finished "git am --abort" && > > + test_must_fail git -c advice.amWorkDir=false am bad-patch.diff 2>actual && > > echo "error: git diff header lacks filename information (line 4)" >expected && > > test_path_is_file f && > > test_i18ncmp expected actual > > Makes sense. The first mini-test used to just set up "actual" and there > was only one test using it, so it's hard to argue it was a "setup" > phase. This looks better.
-- Danh