Merge pull request #139 from Alrim42/develop

Fixes #114 - solved problem with medium test
intelsdi-x · Jul 19, 2017 · fc0d138 · fc0d138
2 parents 41af841 + 5169c5a
commit fc0d138
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/scripts/medium.sh b/scripts/medium.sh
@@ -15,7 +15,6 @@ __proj_name="$(basename $__proj_dir)"
 export INFLUXDB_VERSION="${INFLUXDB_VERSION:-"1.0"}"
 export PLUGIN_SRC="${__proj_dir}"
 
-export GOLANGVER=${GOLANGVER:-"go1.7.4"}
 
 TEST_TYPE="${TEST_TYPE:-"medium"}"
 

diff --git a/scripts/test.sh b/scripts/test.sh
@@ -30,6 +30,20 @@ set -o pipefail
 __dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 __proj_dir="$(dirname "$__dir")"
 
+export GOLANGVER=${GOLANGVER:-"go1.7.4"}
+
+# Remove existing containers
+if [ "$(docker ps -q -f "name=/golang_${GOLANGVER}\b")" ]; then 
+        echo -n "Removing old container (golang_${GOLANGVER}) ... "        
+        docker rm -f golang_${GOLANGVER}         
+fi
+
+if [ "$(docker ps -q -f 'name=/influxdb\b')" ]; then 
+        echo -n "Removing old container (influxdb) ... "   
+        docker rm -f influxdb          
+fi
+
+
 # shellcheck source=scripts/common.sh
 . "${__dir}/common.sh"