improved tests

Author: Nortamo

tests/get_container.py

@@ -0,0 +1,5 @@
+import sys
+sys.path.append("../")
+sys.path.append("../../")
+import cw_common
+print(cw_common.get_docker_image('/etc/os-release')[1])

tests/setup.sh

@@ -33,6 +33,10 @@ else
   export   _NC=""
 fi
 
+_msg(){
+    echo -en "[ - ] $1\r"
+}
+
 _ok (){
     echo -e "[ ${_GREEN}OK${_NC} ] $1"
 
@@ -43,6 +47,7 @@ _fail(){
 
 
 t_run(){
+    _msg "$2"
     eval "$1" &>>test.log 
     if [[ $? -eq 0 ]];then
         _ok "$2"

tests/test-03.sh

@@ -65,6 +65,7 @@ Gdal/bin/python -m venv Py
 t_run 'Py/bin/python -c "import sys;import os;sys.exit(\"CONDA_PREFIX\" in os.environ)"' "Conda is not active in venv"
 export CW_FORCE_CONDA_ACTIVATE=1
 t_run 'Py/bin/python -c "import sys;import os;sys.exit(\"CONDA_PREFIX\" not in os.environ)"' "Conda can be activated in venv"
+t_run 'Py/bin/python -c "import os;import shutil;import sys;sys.exit(shutil.which(\"python3\") != os.getcwd()+\"/Py/bin/python3\" )"' "Venv path is first even if conda is active"
 unset CW_FORCE_CONDA_ACTIVATE
 unset CW_EXTRA_BIND_MOUNTS
 mkdir -p M MyProg/bin N