summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorDenton Liu <liu.denton@gmail.com>2020-01-07 04:53:12 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-01-27 20:56:02 (GMT)
commita8c663cf65ae1e40c90bfd4a1dd3e8d1826eafbe (patch)
treeec86de7e67819f065ff945a03638d38305095045 /t
parent2def7f017ccedd04d86f7f343020f1f1bf3dfac8 (diff)
downloadgit-a8c663cf65ae1e40c90bfd4a1dd3e8d1826eafbe.zip
git-a8c663cf65ae1e40c90bfd4a1dd3e8d1826eafbe.tar.gz
git-a8c663cf65ae1e40c90bfd4a1dd3e8d1826eafbe.tar.bz2
t3507: use test_path_is_missing()
The test_must_fail() function should only be used for git commands since we should assume that external commands work sanely. Replace `test_must_fail test_path_exists` with `test_path_is_missing` since we expect these paths to not exist. Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
-rwxr-xr-xt/t3507-cherry-pick-conflict.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/t/t3507-cherry-pick-conflict.sh b/t/t3507-cherry-pick-conflict.sh
index 2a0d119..9bd482c 100755
--- a/t/t3507-cherry-pick-conflict.sh
+++ b/t/t3507-cherry-pick-conflict.sh
@@ -168,7 +168,7 @@ test_expect_success 'successful final commit clears cherry-pick state' '
echo resolved >foo &&
test_path_is_file .git/sequencer/todo &&
git commit -a &&
- test_must_fail test_path_exists .git/sequencer
+ test_path_is_missing .git/sequencer
'
test_expect_success 'reset after final pick clears cherry-pick state' '
@@ -178,7 +178,7 @@ test_expect_success 'reset after final pick clears cherry-pick state' '
echo resolved >foo &&
test_path_is_file .git/sequencer/todo &&
git reset &&
- test_must_fail test_path_exists .git/sequencer
+ test_path_is_missing .git/sequencer
'
test_expect_success 'failed cherry-pick produces dirty index' '
@@ -387,7 +387,7 @@ test_expect_success 'successful final commit clears revert state' '
echo resolved >foo &&
test_path_is_file .git/sequencer/todo &&
git commit -a &&
- test_must_fail test_path_exists .git/sequencer
+ test_path_is_missing .git/sequencer
'
test_expect_success 'reset after final pick clears revert state' '
@@ -397,7 +397,7 @@ test_expect_success 'reset after final pick clears revert state' '
echo resolved >foo &&
test_path_is_file .git/sequencer/todo &&
git reset &&
- test_must_fail test_path_exists .git/sequencer
+ test_path_is_missing .git/sequencer
'
test_expect_success 'revert conflict, diff3 -m style' '