From: Denton Liu <redacted>
Date: Tue, 7 Jan 2020 04:53:05 +0000 (-0500)
Subject: t3030: use test_path_is_missing()
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=245b9ba0ba51a9e19f77a2a96a82a4f021d4a9fc;p=git.git

t3030: use test_path_is_missing()

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>
---

diff --git a/t/t3030-merge-recursive.sh b/t/t3030-merge-recursive.sh
index 2170758e38..d48d211a95 100755
--- a/t/t3030-merge-recursive.sh
+++ b/t/t3030-merge-recursive.sh
@@ -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' '