瀏覽代碼

As suggested by Tianon, replace the sleep command by the use of the retry.sh script

Miguel Moquillon 9 年之前
父節點
當前提交
d6e20f01c9
共有 1 個文件被更改,包括 6 次插入2 次删除
  1. 6 2
      test/tests/silverpeas-basics/run.sh

+ 6 - 2
test/tests/silverpeas-basics/run.sh

@@ -13,8 +13,12 @@ cname="silverpeas-container-$RANDOM-$RANDOM"
 cid="$(docker run -d -e DB_SERVERTYPE="H2" -e DB_SERVER=":file:" -e DB_PASSWORD="sa" --name "$cname" "$image")"
 trap "docker rm -vf $cid > /dev/null" EXIT
 
-# the maximum time for Silverpeas to be configured and to be started (if no errors)
-sleep 120s
+check_running() {
+  docker run --rm --link "$cid":silverpeas "$image" wget silverpeas:8000/silverpeas &>/dev/null
+  return $?
+}
+
+. "$dir/../../retry.sh" --tries 20 --sleep 5 'check_running'
 
 silverpeas_status="$(docker exec "$cname" /opt/silverpeas/bin/silverpeas status)"