increase cors/k8s/swarms timeout and fix tests/ui container names

examples/cors/tests.json

@@ -1,7 +1,7 @@
 {
   "name": "cors",
   "kinds": ["docker", "autoconf", "linux"],
-  "timeout": 60,
+  "timeout": 120,
   "tests": [
     {
       "type": "string",

tests/KubernetesTest.py

@@ -75,7 +75,7 @@ class KubernetesTest(Test):
                 raise (Exception("kubectl apply bunkerweb failed (k8s stack)"))
             healthy = False
             i = 0
-            while i < 30:
+            while i < 120:
                 proc = run(
                     "kubectl get pods | grep bunkerweb | grep -v Running",
                     shell=True,

tests/SwarmTest.py

@@ -57,7 +57,7 @@ class SwarmTest(Test):
                 raise (Exception("docker stack deploy failed (swarm stack)"))
             i = 0
             healthy = False
-            while i < 90:
+            while i < 120:
                 proc = run(
                     'docker stack ps --no-trunc --format "{{ .CurrentState }}" bunkerweb | grep -v "Running"',
                     cwd="/tmp/swarm",
@@ -71,7 +71,7 @@ class SwarmTest(Test):
                 i += 1
             if not healthy:
                 proc = run(
-                    "docker service logs bunkerweb_bunkerweb ; docker service logs bunkerweb_bw-autoconf ; docker service logs bunkerweb_bw-scheduler",
+                    "docker service logs bunkerweb_bunkerweb ; docker service logs bunkerweb_bw-autoconf ; docker service logs bunkerweb_bw-scheduler ; docker service logs bunkerweb_bw-db",
                     cwd="/tmp/swarm",
                     shell=True,
                     capture_output=True,

tests/ui/tests.sh

@@ -21,7 +21,7 @@ if [ $? -ne 0 ] ; then
 fi
 i=0
 while [ $i -lt 120 ] ; do
-    containers=("ui-bw-1" "ui-bw-scheduler-1" "ui-bw-ui-1" "ui-bw-docker-proxy-1" "ui-app1-1")
+    containers=("ui_bw_1" "ui_bw-scheduler_1" "ui_bw-ui_1" "ui_bw-docker-proxy_1" "ui_app1_1")
     healthy="true"
     for container in "${containers[@]}" ; do
         check="$(docker inspect --format "{{json .State.Health }}" $container | grep "healthy")"