Skip to contentSkip to conversation

t3435: remove redundant test case

PATCH In review Phillip Wood via GitGitGadget 3 participants 3 messages Oct 10, 2022 – Oct 11, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 t3435: remove redundant test case

From: Phillip Wood <[email protected]>

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

---
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(-)
t/t3435-rebase-gpg-sign.sh +0 -8
index 5f8ba2c7399..6aa2aeb628d 100755
@@ -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

Signature · 1 line
gitgitgadget
#1 lore raw
Quoted 4 lines · Phillip Wood via GitGitGadget

From: Phillip Wood <[email protected]>

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?

Quoted 21 lines
t/t3435-rebase-gpg-sign.sh +0 -8
index 5f8ba2c7399..6aa2aeb628d 100755
@@ -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

#2 lore raw

Hi Junio

Quoted 11 lines · Junio C Hamano
Quoted 4 lines · Phillip Wood via GitGitGadget

From: Phillip Wood <[email protected]>

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

Quoted 21 lines
Quoted 21 lines
t/t3435-rebase-gpg-sign.sh +0 -8
index 5f8ba2c7399..6aa2aeb628d 100755
@@ -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