kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

t3407: use test_path_is_missing 

At the end of the test we expect the state directory to be missing,
but the tests only check it is not a directory.

Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Phillip Wood 2021-09-13 15:19:16 +00:00 committed by Junio C Hamano
parent 54627db03a
commit 0b7ae738a6
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
t/t3407-rebase-abort.sh
View File

@ -30,7 +30,7 @@ testrebase() {
test_path_is_dir "$state_dir" &&
git rebase --abort &&
test_cmp_rev to-rebase pre-rebase &&
test ! -d "$state_dir"
test_path_is_missing "$state_dir"
'

test_expect_success "rebase$type --abort after --skip" '
@ -42,7 +42,7 @@ testrebase() {
test_cmp_rev HEAD main &&
git rebase --abort &&
test_cmp_rev to-rebase pre-rebase &&
test ! -d "$state_dir"
test_path_is_missing "$state_dir"
'

test_expect_success "rebase$type --abort after --continue" '
@ -57,7 +57,7 @@ testrebase() {
test_cmp_rev ! HEAD main &&
git rebase --abort &&
test_cmp_rev to-rebase pre-rebase &&
test ! -d "$state_dir"
test_path_is_missing "$state_dir"
'

test_expect_success "rebase$type --abort does not update reflog" '
@ -92,7 +92,7 @@ test_expect_success 'rebase --apply --quit' '
head_before=$(git rev-parse HEAD) &&
git rebase --quit &&
test_cmp_rev HEAD $head_before &&
test ! -d .git/rebase-apply
test_path_is_missing .git/rebase-apply
'

test_expect_success 'rebase --merge --quit' '
@ -103,7 +103,7 @@ test_expect_success 'rebase --merge --quit' '
head_before=$(git rev-parse HEAD) &&
git rebase --quit &&
test_cmp_rev HEAD $head_before &&
test ! -d .git/rebase-merge
test_path_is_missing .git/rebase-merge
'

test_done