commit 8cb67a071aa0b080d1f37c34a07716cdd0872995
author Carlos Sanchez <carlos@apache.org> Wed Apr 20 13:40:44 2016 +0200
committer Carlos Sanchez <carlos@apache.org> Wed Apr 20 13:49:12 2016 +0200
tree 101170c356ba750f14683e19022ecc4bfbcbaeb2
parent 2d72a186ba3e5fe79fe6d98b456dae49a40d810f

Some bash improvements

tests/test_helpers.bash

diff --git a/tests/test_helpers.bash b/tests/test_helpers.bash
index e604930..787edd3 100644
--- a/tests/test_helpers.bash
+++ b/tests/test_helpers.bash
@@ -1,3 +1,4 @@
+#!/bin/bash
 
 # check dependencies
 (
@@ -9,7 +10,8 @@
 function assert {
     local expected_output=$1
     shift
-    local actual_output=$("$@")
+    local actual_output
+    actual_output=$("$@")
     actual_output="${actual_output//[$'\t\r\n']}" # remove newlines
     if ! [ "$actual_output" = "$expected_output" ]; then
         echo "expected: \"$expected_output\""
@@ -34,7 +36,7 @@
         sleep $delay
     done
 
-    echo "Command \"$@\" failed $attempts times. Status: $status. Output: $output" >&2
+    echo "Command \"$*\" failed $attempts times. Status: $status. Output: $output" >&2
     false
 }
 
@@ -42,13 +44,13 @@
     if [ -z "${DOCKER_HOST}" ]; then
         DOCKER_IP=localhost
     else
-        DOCKER_IP=$(echo $DOCKER_HOST | sed -e 's|tcp://\(.*\):[0-9]*|\1|')
+        DOCKER_IP=$(echo "$DOCKER_HOST" | sed -e 's|tcp://\(.*\):[0-9]*|\1|')
     fi
-    echo "http://$DOCKER_IP:$(docker port $SUT_CONTAINER 8080 | cut -d: -f2)"
+    echo "http://$DOCKER_IP:$(docker port "$SUT_CONTAINER" 8080 | cut -d: -f2)"
 }
 
 function test_url {
-    run curl --output /dev/null --silent --head --fail --connect-timeout 30 --max-time 60 $(get_jenkins_url)$1
+    run curl --output /dev/null --silent --head --fail --connect-timeout 30 --max-time 60 "$(get_jenkins_url)$1"
     if [ "$status" -eq 0 ]; then
         true
     else
@@ -59,6 +61,6 @@
 }
 
 function cleanup {
-    docker kill $1 &>/dev/null ||:
-    docker rm -fv $1 &>/dev/null ||:
+    docker kill "$1" &>/dev/null ||:
+    docker rm -fv "$1" &>/dev/null ||:
 }