Some lvm specific basic tests

[grml-unittests.git] / framework.sh

diff --git a/framework.sh b/framework.sh
index eab4958..ca18dba 100644 (file)
--- a/framework.sh
+++ b/framework.sh
@@ -5,7 +5,7 @@ export URL_PREFIX=http://10.0.2.2
 BAILOUT_CMD=""
 
 timeout_handler() {
-    wget -q -O /dev/null http://localhost:$STATUS_PORT//FAIL
+    wget -q --post-data="Timeout" -O /dev/null http://localhost:$STATUS_PORT//FAIL
     bailout
 }
 
@@ -16,7 +16,7 @@ bailout() {
 
 run_test()
 {
-    gatling -n -p $COMMON_PORT >/dev/null 2>&1 &
+    python -m SimpleHTTPServer $COMMON_PORT >/dev/null 2>&1 &
     GATLING_PID=$!
     kvm -kernel "$KERNEL" -initrd "$INITRD" -append "$CMDLINE"  -vnc :0 -cdrom "$CDROM" -boot d $KVM_PARAMS &
     KVM_PID=$!
@@ -35,9 +35,7 @@ trap bailout QUIT INT EXIT
 COMMON_PORT=0
 STATUS_PORT=0
 
-while [ $COMMON_PORT -lt 1024  -o  $STATUS_PORT -lt 1024 ] ; do
+while [ $COMMON_PORT -lt 1024 ] || [  $STATUS_PORT -lt 1024 ] ; do
     COMMON_PORT=$RANDOM
     STATUS_PORT=$RANDOM
-
-
 done