[PATCH v2] test_must_be_empty: simplify file existence check

From

SZEDER Gábor <szeder.dev@gmail.com>

Date

Mar 26, 2018, 13:11 UTC

Message-ID

<20180326131124.13003-1-szeder.dev@gmail.com>

In-Reply-To

<20180326124847.GA21993@sigill.intra.peff.net>

Just call 'test_path_is_file' to avoid this code duplication.

Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
---

The only change is to refer to the right commit in the log message.

 t/test-lib-functions.sh | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
index d2eaf5ab67..36ad8accdd 100644
--- a/t/test-lib-functions.sh
+++ b/t/test-lib-functions.sh
@@ -718,11 +718,8 @@ verbose () {
 # otherwise.
 
 test_must_be_empty () {
-	if ! test -f "$1"
-	then
-		echo "'$1' is missing"
-		return 1
-	elif test -s "$1"
+	test_path_is_file "$1" &&
+	if test -s "$1"
 	then
 		echo "'$1' is not empty, it contains:"
 		cat "$1"

-- 
2.17.0.rc1.148.gc92dc354c5