From 505cf3ea3c09b390a57c715e47b65fea764d726d Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Mon, 30 Sep 2013 12:06:49 -0400
Subject: test-common.sh: add an empty() routine to check if a file is empty,
 use it

---
 test/librechroot-test.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'test/librechroot-test.sh')

diff --git a/test/librechroot-test.sh b/test/librechroot-test.sh
index 76afb56..90d0adc 100644
--- a/test/librechroot-test.sh
+++ b/test/librechroot-test.sh
@@ -36,22 +36,22 @@ it_displays_help_as_normal_user() {
 	LANG=C librechroot help >$tmpdir/stdout 2>$tmpdir/stderr
 
 	[[ "$(sed 1q $tmpdir/stdout)" =~ Usage:.* ]]
-	[[ -z "$(cat $tmpdir/stderr)" ]]
+	empty $tmpdir/stderr
 }
 
 it_otherwise_fails_as_normal_user() {
 	librechroot run true >$tmpdir/stdout 2>$tmpdir/stderr || stat=$?
 
 	[[ $stat != 0 ]]
-	[[ -z "$(cat $tmpdir/stdout)" ]]
-	[[ -n "$(cat $tmpdir/stderr)" ]]
+	empty $tmpdir/stdout
+	! empty $tmpdir/stderr
 }
 
 it_displays_help_and_fails_with_0_args() {
 	LANG=C librechroot >$tmpdir/stdout 2>$tmpdir/stderr || stat=$?
 
 	[[ $stat != 0 ]]
-	[[ -z "$(cat $tmpdir/stdout)" ]]
+	empty $tmpdir/stdout
 	[[ "$(sed 1q $tmpdir/stderr)" =~ Usage:.* ]]
 }
 
@@ -61,8 +61,8 @@ it_fails_for_unknown_commands() {
 	testsudo librechroot phony >$tmpdir/stdout 2>$tmpdir/stderr || stat=$?
 
 	[[ $stat != 0 ]]
-	[[ -z "$(cat $tmpdir/stdout)" ]]
-	[[ -n "$(cat $tmpdir/stderr)" ]]
+	empty $tmpdir/stdout
+	! empty $tmpdir/stderr
 }
 
 # requires sudo so we know it's not failing because it needs root
@@ -71,6 +71,6 @@ it_fails_for_unknown_flags() {
 	testsudo librechroot -q >$tmpdir/stdout 2>$tmpdir/stderr || stat=$?
 
 	[[ $stat != 0 ]]
-	[[ -z "$(cat $tmpdir/stdout)" ]]
-	[[ -n "$(cat $tmpdir/stderr)" ]]
+	empty $tmpdir/stdout
+	! empty $tmpdir/stderr
 }
-- 
cgit v1.2.2