add timeout and wait only for appropriated tests

qgis · Sep 6, 2021 · 73753f9 · 73753f9
1 parent 580e7f4
commit 73753f9
Showing 1 changed file with 19 additions and 7 deletions.
diff --git a/.docker/docker-qgis-test.sh b/.docker/docker-qgis-test.sh
@@ -179,13 +179,25 @@ fi
 # Wait for WebDAV container to be ready
 #######################################
 
-echo "Wait for webdav to be ready..."
-while ! curl -f -X GET -u qgis:myPasswd! http://$QGIS_WEBDAV_HOST:$QGIS_WEBDAV_PORT/webdav_tests/ &> /dev/null;
-do
-  sleep 1
-  printf "."
-done
-echo "done"
+if [ $# -eq 0 ] || [ $1 = "ALL_BUT_PROVIDERS" ] || [ $1 = "ALL" ] ; then
+
+  echo "Wait for webdav to be ready..."
+  COUNT=0
+  while ! curl -f -X GET -u qgis:myPasswd! http://$QGIS_WEBDAV_HOST:$QGIS_WEBDAV_PORT/webdav_tests/ &> /dev/null;
+  do
+    printf "."
+    sleep 5
+    if [[ $(( COUNT++ )) -eq 40 ]]; then
+      break
+    fi
+  done
+  if [[ ${COUNT} -eq 41 ]]; then
+    echo "Error: WebDAV docker timeout!!!"
+    exit 1
+  else
+    echo "done"
+  fi
+fi
 
 ###########
 # Run tests