summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhillip Wood <phillip.wood@dunelm.org.uk>2021-09-13 15:19:16 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-09-13 19:47:06 (GMT)
commit0b7ae738a6a166d3b60af68c9b0984971baa7718 (patch)
tree21e225550815c18aa12302dd5446d637b06a2100
parent54627db03a60baec8fee7390b25b6ac806a9ecff (diff)
downloadgit-0b7ae738a6a166d3b60af68c9b0984971baa7718.zip
git-0b7ae738a6a166d3b60af68c9b0984971baa7718.tar.gz
git-0b7ae738a6a166d3b60af68c9b0984971baa7718.tar.bz2
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>
-rwxr-xr-xt/t3407-rebase-abort.sh10
1 files changed, 5 insertions, 5 deletions
diff --git a/t/t3407-rebase-abort.sh b/t/t3407-rebase-abort.sh
index 2c70230..7eba9ec 100755
--- a/t/t3407-rebase-abort.sh
+++ b/t/t3407-rebase-abort.sh
@@ -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