From 51283ab43bc440c626afa75a021d7f7799f0fa26 Mon Sep 17 00:00:00 2001
From: Dieter Plaetinck <dieter@plaetinck.be>
Date: Wed, 22 Jul 2009 22:20:36 +0200
Subject: test suite fixes and cleanups

---
 tests/lib/framework-runtime                                     | 4 ++--
 tests/lib/test-file                                             | 2 --
 tests/lib/test-lvm-lv                                           | 2 --
 tests/lib/test-mount                                            | 2 --
 tests/lib/test-nofile                                           | 2 --
 tests/lib/test-nopackage                                        | 4 +---
 tests/lib/test-ping                                             | 2 --
 tests/lib/test-swap                                             | 2 --
 tests/runtime/automatic-lvm-dmcrypt-install-sda/perform_test.sh | 6 ------
 9 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/tests/lib/framework-runtime b/tests/lib/framework-runtime
index 788fdee..84fa1e2 100644
--- a/tests/lib/framework-runtime
+++ b/tests/lib/framework-runtime
@@ -17,9 +17,9 @@ function aiftest () {
 	fi
 	if [ $ret -eq 0 ]
 	then
-		echo "$NAME : OK"
+		echo "$name $@ : OK"
 	else
-		echo "$NAME [ $ret ] : NOT OK"
+		echo "$name $@ : NOT OK ($ret)"
 	fi
 	[ $ret -gt $STATUS ] && STATUS=$ret
 }
diff --git a/tests/lib/test-file b/tests/lib/test-file
index b1504ae..deb0083 100755
--- a/tests/lib/test-file
+++ b/tests/lib/test-file
@@ -1,6 +1,4 @@
 #!/bin/bash
 # $1 filename
 
-NAME="FILE TEST, $1"
-
 [ -f "$1" ]
diff --git a/tests/lib/test-lvm-lv b/tests/lib/test-lvm-lv
index 2c6a6bc..6525fa1 100755
--- a/tests/lib/test-lvm-lv
+++ b/tests/lib/test-lvm-lv
@@ -3,7 +3,5 @@
 # $2 LV
 # $2 SIZE eg '800.00 MB'
 
-NAME="LOGICAL VOLUME CHECK, /dev/mapper/$1-$2"
-
 lvdisplay | grep -A 5 'LV Name.*/dev/mapper/'$1-$2 | grep -q available || exit 1
 lvdisplay | grep -A 7 'LV Name.*/dev/mapper/'$1-$2 | grep -q 'LV Size.*'"$2" || exit 2
diff --git a/tests/lib/test-mount b/tests/lib/test-mount
index e45715a..3497167 100755
--- a/tests/lib/test-mount
+++ b/tests/lib/test-mount
@@ -1,6 +1,4 @@
 #!/bin/bash
 # $1 mount output string
 
-NAME="MOUNT CHECK, $1"
-
 mount | grep -q '/dev/mapper/cryptpool-crypthome on /home type xfs (rw)'
diff --git a/tests/lib/test-nofile b/tests/lib/test-nofile
index f5e13c5..e7d9c1b 100755
--- a/tests/lib/test-nofile
+++ b/tests/lib/test-nofile
@@ -1,6 +1,4 @@
 #!/bin/bash
 # $1 filename
 
-NAME="NOFILE TEST, $1"
-
 [ ! -f "$1" ]
diff --git a/tests/lib/test-nopackage b/tests/lib/test-nopackage
index 62bfc36..8534869 100755
--- a/tests/lib/test-nopackage
+++ b/tests/lib/test-nopackage
@@ -1,9 +1,7 @@
 #!/bin/bash
 # $1 packagename
 
-NAME="NO PACKAGE, $1"
-
-if pacman -Qi $1
+if pacman -Qi $1 &>/dev/null
 then
 	exit 1
 else
diff --git a/tests/lib/test-ping b/tests/lib/test-ping
index 2fba015..368c9ca 100755
--- a/tests/lib/test-ping
+++ b/tests/lib/test-ping
@@ -2,6 +2,4 @@
 # $1 iterations
 # $2 host
 
-NAME="PING CHECK ON $2"
-
 ping -c $1 $2
diff --git a/tests/lib/test-swap b/tests/lib/test-swap
index 892815d..3f375c4 100755
--- a/tests/lib/test-swap
+++ b/tests/lib/test-swap
@@ -1,5 +1,3 @@
 #!/bin/bash
 
-name="SWAP CHECK, SIZE $1"
-
 free -m | grep -q 'Swap:.*'$1'.*'
\ No newline at end of file
diff --git a/tests/runtime/automatic-lvm-dmcrypt-install-sda/perform_test.sh b/tests/runtime/automatic-lvm-dmcrypt-install-sda/perform_test.sh
index 390ee63..006307f 100644
--- a/tests/runtime/automatic-lvm-dmcrypt-install-sda/perform_test.sh
+++ b/tests/runtime/automatic-lvm-dmcrypt-install-sda/perform_test.sh
@@ -16,9 +16,3 @@ aiftest nopackage sudo
 aiftest ping 2 archlinux.org
 
 aiftest-done
-
-
-
-	[ -f "$i/test_file" ] || echo "TEST FAILED. NO FILE $i/test_file"
-
-ping -c 2 archlinux.org || echo 'PING CHECK FAILED'
-- 
cgit v1.2.3-54-g00ecf