From 7f81df826aa302bdd9bbf5d859347079a1f771a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Busse?= <bj.rn@baerlin.eu>
Date: Wed, 3 Mar 2021 19:24:18 +0100
Subject: [PATCH] tests: Execute once

---
 tests/test_hbase_up.sh | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/tests/test_hbase_up.sh b/tests/test_hbase_up.sh
index 331178b..583ef5e 100644
--- a/tests/test_hbase_up.sh
+++ b/tests/test_hbase_up.sh
@@ -2,28 +2,25 @@
 
 HBASE_HOST="127.0.0.1"
 HBASE_PORT=16200
-ZK_HOST=$HBASE_HOST
+ZK_HOST="$HBASE_HOST"
 ZK_PORT=2181
 HBASE_TIME_STARTUP=8
 HBASE_VERSION="2.4.1"
 
-run_hbase() {
+test_run_hbase() {
     cd "../hbase-${HBASE_VERSION}"
     ./bin/hbase-daemon.sh --config conf start $1
     sleep ${HBASE_TIME_STARTUP}
 }
 
 test_hbase_running() {
-    nc -vnu -w1 $1 $2
+    nc -znu -w1 ${1:-"127.0.0.1"} ${2:-"16200"}
 }
 
 test_hbase_zk_running() {
-    nc -vnu -w1 $1 $2 <<END
+    nc -znu -w1 ${1:-"127.0.0.1"} ${2:-"2181"} <<END
 "ruok"
 END
 }
 
 export JAVA_HOME=${JAVA_HOME:-"/usr/local"}
-run_hbase "master"
-test_hbase_running ${HBASE_HOST} ${HBASE_PORT}
-test_hbase_zk_running ${ZK_HOST} ${ZK_PORT}