From: Denton Liu Date: Tue, 7 Jan 2020 04:53:12 +0000 (-0500) Subject: t3507: use test_path_is_missing() X-Git-Tag: v2.26.0-rc0~61^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a8c663cf65ae1e40c90bfd4a1dd3e8d1826eafbe;p=thirdparty%2Fgit.git 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 Signed-off-by: Junio C Hamano --- diff --git a/t/t3507-cherry-pick-conflict.sh b/t/t3507-cherry-pick-conflict.sh index 2a0d119c8a..9bd482ce3b 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' '