| Message ID | d1bc31e692d08d73bc577f737b0190e163440ee9.1587289680.git.congdanhqx@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | mailinfo: disallow and complains about NUL character | expand |
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.) > 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. Martin
On 2020-04-19 14:25:41+0200, Martin Ågren <martin.agren@gmail.com> wrote: > 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. > > 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.
diff --git a/t/t4254-am-corrupt.sh b/t/t4254-am-corrupt.sh index fd3bdbfe2c..ddd35498db 100755 --- a/t/t4254-am-corrupt.sh +++ b/t/t4254-am-corrupt.sh @@ -25,10 +25,8 @@ test_expect_success setup ' # fatal: unable to write file '(null)' mode 100644: Bad address # Also, it had the unwanted side-effect of deleting f. 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
While we are at it, make sure we run a clean up after testing. In a later patch, we will test for more corrupted patch. Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com> --- t/t4254-am-corrupt.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)