threads / patch / 61123

patcht5300: fix test_with_bad_commit()

Subject: [PATCH] t5300: fix test_with_bad_commit()

## tl;dr

2 messages between Mar 15, 2024 and Mar 15, 2024. Diffs are folded; open one to read it.

replies: 1people: 2as markdown or json

John Cai via GitGitGadget· Mar 15, 2024, 04:57 UTC · lore

From: John Cai <johncai86@gmail.com>

0f8edf7317 (index-pack: --fsck-objects to take an optional argument for fsck msgs, 2024-02-01) added a test function test_with_bad_commit() that contained two bugs. test_expect_fail was used instead of test_must_fail, and a && was not included at the end of the line.

Fix these two issues in the test.

Signed-off-by: John Cai <johncai86@gmail.com>
---
    t5300: fix test_with_bad_commit()
    
    0f8edf7317 (index-pack: --fsck-objects to take an optional argument for
    fsck msgs, 2024-02-01) added a test function test_with_bad_commit() that
    contained two bugs. test_expect_fail was used instead of test_must_fail,
    and a && was not included at the end of the line.
    
    Fix these two issues in the test.

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1688%2Fjohn-cai%2Fjc%2Ffix-t5300-tests-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1688/john-cai/jc/fix-t5300-tests-v1
Pull-Request: https://github.com/git/git/pull/1688

 t/t5300-pack-object.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Show changes to t/t5300-pack-object.sh +1 −1

diff --git a/t/t5300-pack-object.sh b/t/t5300-pack-object.sh
index a58f91035d1..61e2be2903d 100755
--- a/t/t5300-pack-object.sh
+++ b/t/t5300-pack-object.sh
@@ -465,7 +465,7 @@ test_with_bad_commit () {
 	must_pass_arg="$2" &&
 	(
 		cd strict &&
-		test_expect_fail git index-pack "$must_fail_arg" "test-$(cat pack-name).pack"
+		test_must_fail git index-pack "$must_fail_arg" "test-$(cat pack-name).pack" &&
 		git index-pack "$must_pass_arg" "test-$(cat pack-name).pack"
 	)
 }

base-commit: e09f1254c54329773904fe25d7c545a1fb4fa920

-- 
gitgitgadget

Junio C Hamano· Mar 15, 2024, 17:07 UTC · re: John Cai via GitGitGadget · lore

Re: [PATCH] t5300: fix test_with_bad_commit()

"John Cai via GitGitGadget" <gitgitgadget@gmail.com> writes:

Show 8 quoted lines

> From: John Cai <johncai86@gmail.com>
>
> 0f8edf7317 (index-pack: --fsck-objects to take an optional argument for
> fsck msgs, 2024-02-01) added a test function test_with_bad_commit() that
> contained two bugs. test_expect_fail was used instead of test_must_fail,
> and a && was not included at the end of the line.
>
> Fix these two issues in the test.

Wow.  This is an embarrassing one.  Thanks for a fix.

Show 33 quoted lines

> Signed-off-by: John Cai <johncai86@gmail.com>
> ---
>     t5300: fix test_with_bad_commit()
>     
>     0f8edf7317 (index-pack: --fsck-objects to take an optional argument for
>     fsck msgs, 2024-02-01) added a test function test_with_bad_commit() that
>     contained two bugs. test_expect_fail was used instead of test_must_fail,
>     and a && was not included at the end of the line.
>     
>     Fix these two issues in the test.
>
> Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1688%2Fjohn-cai%2Fjc%2Ffix-t5300-tests-v1
> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1688/john-cai/jc/fix-t5300-tests-v1
> Pull-Request: https://github.com/git/git/pull/1688
>
>  t/t5300-pack-object.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/t/t5300-pack-object.sh b/t/t5300-pack-object.sh
> index a58f91035d1..61e2be2903d 100755
> --- a/t/t5300-pack-object.sh
> +++ b/t/t5300-pack-object.sh
> @@ -465,7 +465,7 @@ test_with_bad_commit () {
>  	must_pass_arg="$2" &&
>  	(
>  		cd strict &&
> -		test_expect_fail git index-pack "$must_fail_arg" "test-$(cat pack-name).pack"
> +		test_must_fail git index-pack "$must_fail_arg" "test-$(cat pack-name).pack" &&
>  		git index-pack "$must_pass_arg" "test-$(cat pack-name).pack"
>  	)
>  }
>
> base-commit: e09f1254c54329773904fe25d7c545a1fb4fa920