t3030: use test_path_is_missing()
authorDenton Liu <redacted>
Tue, 7 Jan 2020 04:53:05 +0000 (23:53 -0500)
committerJunio C Hamano <redacted>
Mon, 27 Jan 2020 20:56:02 +0000 (12:56 -0800)
We use `test_must_fail test -d` to ensure that the directory is removed.
However, test_must_fail() should only be used for git commands. Use
test_path_is_missing() instead to check that the directory has been
removed.

Signed-off-by: Denton Liu <redacted>
Signed-off-by: Junio C Hamano <redacted>
t/t3030-merge-recursive.sh

index 2170758e38d786709425f3f39f2c481352e82e8e..d48d211a95403c4f995982a0a8bca2c1f1eaa17b 100755 (executable)
@@ -604,7 +604,7 @@ test_expect_success 'merge removes empty directories' '
        git commit -mremoved-d/e &&
        git checkout master &&
        git merge -s recursive rm &&
-       test_must_fail test -d d
+       test_path_is_missing d
 '
 
 test_expect_success 'merge-recursive simple w/submodule' '
git clone https://git.99rst.org/PROJECT