From 424d6ed34b9d1e76a11dfea68f3ea9e3e7a1298b Mon Sep 17 00:00:00 2001
From: Erik Timan <erik.timan@emqx.io>
Date: Tue, 24 Jan 2023 14:42:52 +0100
Subject: [PATCH] test: improve start.sh script for influxdb tests

---
 scripts/test/influx/start.sh | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/scripts/test/influx/start.sh b/scripts/test/influx/start.sh
index d06a2d44a..f430d353a 100755
--- a/scripts/test/influx/start.sh
+++ b/scripts/test/influx/start.sh
@@ -1,13 +1,15 @@
 #!/usr/bin/env bash
 
 NET='emqx.influx.io'
-NODE1="emqx@emqx_1.$NET"
-NODE2="emqx@emqx_2.$NET"
+NODE2_FQDN="emqx@emqx_2.$NET"
+NODE1_CONTAINER_NAME="emqx_1"
+NODE2_CONTAINER_NAME="emqx_2"
+INFLUXDB_CONTAINER_NAME="influxdb_server"
 export EMQX_IMAGE_TAG="${EMQX_IMAGE_TAG:-latest}"
 
-cd -P -- "$(dirname -- "${BASH_SOURCE[0]}")"
+cd -P -- "$(dirname -- "${BASH_SOURCE[0]}")" || exit
 
-docker rm -f emqx_1 emqx_2 influxdb_server
+docker rm -f "$NODE1_CONTAINER_NAME" "$NODE2_CONTAINER_NAME" "$INFLUXDB_CONTAINER_NAME"
 docker-compose up -d
 
 wait_limit=60
@@ -26,9 +28,9 @@ wait_for_emqx() {
     done
 }
 
-wait_for_emqx emqx_1 30
-wait_for_emqx emqx_2 30
+wait_for_emqx "$NODE1_CONTAINER_NAME" 30
+wait_for_emqx "$NODE2_CONTAINER_NAME" 30
 
 echo
 
-docker exec emqx_1 emqx_ctl cluster join "$NODE2"
+docker exec "$NODE1_CONTAINER_NAME" emqx_ctl cluster join "$NODE2_FQDN"