diff mbox series

t3435: remove redundant test case

Message ID pull.1379.git.1665395106351.gitgitgadget@gmail.com (mailing list archive)
State Accepted
Commit a677d3c4165a279f594871f578c15a5493a94d5e
Headers show
Series t3435: remove redundant test case | expand

Commit Message

Phillip Wood Oct. 10, 2022, 9:45 a.m. UTC 
From: Phillip Wood <phillip.wood@dunelm.org.uk>

rebase --preserve-merges no longer exists so there is no point in
carrying this failing test case.

Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
---
    t3435: remove redundant test case
    
    test_expect_failure was covering up an unexpected failure.

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1379%2Fphillipwood%2Fwip%2Frebase-remove-redundant-test-case-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1379/phillipwood/wip/rebase-remove-redundant-test-case-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/1379

 t/t3435-rebase-gpg-sign.sh | 8 --------
 1 file changed, 8 deletions(-)


base-commit: 3dcec76d9df911ed8321007b1d197c1a206dc164

Comments

Junio C Hamano Oct. 10, 2022, 5:02 p.m. UTC | #1 
"Phillip Wood via GitGitGadget" <gitgitgadget@gmail.com> writes:

> From: Phillip Wood <phillip.wood@dunelm.org.uk>
>
> rebase --preserve-merges no longer exists so there is no point in
> carrying this failing test case.

Looks good.

I can imagine that you noticed that it was failing for a wrong
reason, perhaps as part of your test-todo topic?

> diff --git a/t/t3435-rebase-gpg-sign.sh b/t/t3435-rebase-gpg-sign.sh
> index 5f8ba2c7399..6aa2aeb628d 100755
> --- a/t/t3435-rebase-gpg-sign.sh
> +++ b/t/t3435-rebase-gpg-sign.sh
> @@ -64,14 +64,6 @@ test_rebase_gpg_sign ! true  -i --no-gpg-sign
>  test_rebase_gpg_sign ! true  -i --gpg-sign --no-gpg-sign
>  test_rebase_gpg_sign   false -i --no-gpg-sign --gpg-sign
>  
> -test_expect_failure 'rebase -p --no-gpg-sign override commit.gpgsign' '
> -	test_when_finished "git clean -f" &&
> -	git reset --hard merged &&
> -	git config commit.gpgsign true &&
> -	git rebase -p --no-gpg-sign --onto=one fork-point main &&
> -	test_must_fail git verify-commit HEAD
> -'
> -
>  test_expect_success 'rebase -r, merge strategy, --gpg-sign will sign commit' '
>  	git reset --hard merged &&
>  	test_unconfig commit.gpgsign &&
>
> base-commit: 3dcec76d9df911ed8321007b1d197c1a206dc164
Phillip Wood Oct. 11, 2022, 3:38 p.m. UTC | #2 
Hi Junio

On 10/10/2022 18:02, Junio C Hamano wrote:
> "Phillip Wood via GitGitGadget" <gitgitgadget@gmail.com> writes:
> 
>> From: Phillip Wood <phillip.wood@dunelm.org.uk>
>>
>> rebase --preserve-merges no longer exists so there is no point in
>> carrying this failing test case.
> 
> Looks good.
> 
> I can imagine that you noticed that it was failing for a wrong
> reason, perhaps as part of your test-todo topic?

Yes I noticed it when I was looking for tests to convert to test-todo.

Best Wishes

Phillip

>> diff --git a/t/t3435-rebase-gpg-sign.sh b/t/t3435-rebase-gpg-sign.sh
>> index 5f8ba2c7399..6aa2aeb628d 100755
>> --- a/t/t3435-rebase-gpg-sign.sh
>> +++ b/t/t3435-rebase-gpg-sign.sh
>> @@ -64,14 +64,6 @@ test_rebase_gpg_sign ! true  -i --no-gpg-sign
>>   test_rebase_gpg_sign ! true  -i --gpg-sign --no-gpg-sign
>>   test_rebase_gpg_sign   false -i --no-gpg-sign --gpg-sign
>>   
>> -test_expect_failure 'rebase -p --no-gpg-sign override commit.gpgsign' '
>> -	test_when_finished "git clean -f" &&
>> -	git reset --hard merged &&
>> -	git config commit.gpgsign true &&
>> -	git rebase -p --no-gpg-sign --onto=one fork-point main &&
>> -	test_must_fail git verify-commit HEAD
>> -'
>> -
>>   test_expect_success 'rebase -r, merge strategy, --gpg-sign will sign commit' '
>>   	git reset --hard merged &&
>>   	test_unconfig commit.gpgsign &&
>>
>> base-commit: 3dcec76d9df911ed8321007b1d197c1a206dc164
diff mbox series

Patch

diff --git a/t/t3435-rebase-gpg-sign.sh b/t/t3435-rebase-gpg-sign.sh
index 5f8ba2c7399..6aa2aeb628d 100755
--- a/t/t3435-rebase-gpg-sign.sh
+++ b/t/t3435-rebase-gpg-sign.sh
@@ -64,14 +64,6 @@  test_rebase_gpg_sign ! true  -i --no-gpg-sign
 test_rebase_gpg_sign ! true  -i --gpg-sign --no-gpg-sign
 test_rebase_gpg_sign   false -i --no-gpg-sign --gpg-sign
 
-test_expect_failure 'rebase -p --no-gpg-sign override commit.gpgsign' '
-	test_when_finished "git clean -f" &&
-	git reset --hard merged &&
-	git config commit.gpgsign true &&
-	git rebase -p --no-gpg-sign --onto=one fork-point main &&
-	test_must_fail git verify-commit HEAD
-'
-
 test_expect_success 'rebase -r, merge strategy, --gpg-sign will sign commit' '
 	git reset --hard merged &&
 	test_unconfig commit.gpgsign &&