From 30db3e281de44eb0fc355db23b32c12cf7f5c922 Mon Sep 17 00:00:00 2001
From: Filipe Brandenburger <filbranden@google.com>
Date: Tue, 23 Sep 2014 09:33:19 -0700
Subject: [PATCH] Cleanup hack/test-integration.sh

Proper quoting, error checks, use $KUBE_* variables when applicable, trap to do
cleanup on all errors, call cleanup explicitly on successful exit.

Tested:
- Ran it manually to completion, test run successful.
- Interrupted it during the run, checked that $? was non-zero, etcd was killed.

Signed-off-by: Filipe Brandenburger <filbranden@google.com>
---
 hack/test-integration.sh | 55 ++++++++++++++++++++--------------------
 1 file changed, 27 insertions(+), 28 deletions(-)

diff --git a/hack/test-integration.sh b/hack/test-integration.sh
index bc87e6c4233..f36514d0656 100755
--- a/hack/test-integration.sh
+++ b/hack/test-integration.sh
@@ -14,41 +14,40 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-source $(dirname $0)/util.sh
-source $(dirname $0)/config-go.sh
+set -o errexit
+set -o nounset
+set -o pipefail
 
-function cleanup()
-{
-    set +e
-    kill ${ETCD_PID} 1>&2 2>/dev/null
-    rm -rf ${ETCD_DIR} 1>&2 2>/dev/null
-    echo
-    echo "Complete"
+basedir=$(dirname "$0")
+source "${basedir}/config-go.sh"
+
+source "${KUBE_REPO_ROOT}/hack/util.sh"
+
+cleanup() {
+  kill "${ETCD_PID-}" >/dev/null 2>&1 || :
+  rm -rf "${ETCD_DIR-}"
+  echo ""
+  echo "Complete"
 }
 
-# Stop right away if the build fails
-set -e
-
-if [[ -z $KUBE_NO_BUILD_INTEGRATION ]]; then
-    $(dirname $0)/build-go.sh cmd/integration
+if [[ "${KUBE_NO_BUILD_INTEGRATION+set}" != "set" ]]; then
+    "${KUBE_REPO_ROOT}/hack/build-go.sh" cmd/integration
 fi
 
+# Run cleanup to stop etcd on interrupt or other kill signal.
+trap cleanup HUP INT QUIT TERM
+
 start_etcd
 
-trap cleanup EXIT SIGINT
-
-echo
-echo Integration test cases ...
-echo
+echo ""
+echo "Integration test cases..."
+echo ""
 GOFLAGS="-tags 'integration no-docker'" \
-    ${KUBE_REPO_ROOT}/hack/test-go.sh test/integration
-# leave etcd running if integration tests fail
-trap "echo etcd still running" EXIT
+  "${KUBE_REPO_ROOT}/hack/test-go.sh" test/integration
 
-echo
-echo Integration scenario ...
-echo
-${KUBE_TARGET}/bin/integration
+echo ""
+echo "Integration scenario ..."
+echo ""
+"${KUBE_TARGET}/bin/integration"
 
-# nuke etcd
-trap cleanup EXIT SIGINT
+cleanup