Merge pull request #25 from mundialis/grass_test_improvements

improvements of grass tests

grass-gis-test-docker/Dockerfile

@@ -1,11 +1,18 @@
-FROM osgeo/grass-gis:current-alpine
+FROM osgeo/grass-gis:main-alpine
 
 ARG NC_TEST_DATA=""
 
 WORKDIR /src
 COPY . /src
 COPY test-docker/test.sh /src
+
+RUN test -e test-docker/ && rm -rf test-docker/
+
 RUN apk add gcc make python3-dev musl-dev linux-headers
+
+# create environment to install requirements
+RUN python -m venv addon-env
+ENV PATH="/src/addon-env/bin:$PATH"
 RUN test -e requirements.txt && pip3 install -r requirements.txt || echo "No requirements.txt"
 
 # run tests if NC_TEST_DATA is set to NC with downloaded NC test loaction otherwise in empty location

grass-gis-test-docker/test.sh

@@ -26,11 +26,14 @@ fi
 g.extension extension=${ADDON} url=. && \
 for file in $(find . -type f -name test*.py) ; \
 do  \
-  echo ${file}
-  BASENAME=$(basename "${file}") ; \
-  DIR=$(dirname "${file}") ; \
-  cd ${CURRENTDIR}/${DIR} && python3 -m unittest ${BASENAME}
-  for res_file in $(test_keyvalue_result_*.txt) ; do
-    cat ${res_file}
-  done
+  if [[ ${file} != *"addon-env"* ]] ;
+  then
+    echo ${file}
+    BASENAME=$(basename "${file}") ; \
+    DIR=$(dirname "${file}") ; \
+    cd ${CURRENTDIR}/${DIR} && python -m unittest ${BASENAME}
+    for res_file in $(test_keyvalue_result_*.txt) ; do
+      cat ${res_file}
+    done
+  fi
 done