Fix integration tests

The restplus example was impacted by python-restx/flask-restx#460
rycus86 · Aug 2, 2022 · e1aac46 · e1aac46
1 parent fa68d47
commit e1aac46
Show file tree

Hide file tree

Showing 15 changed files with 15 additions and 4 deletions.
diff --git a/examples/connexion-pydantic/run_tests.sh b/examples/connexion-pydantic/run_tests.sh
@@ -3,6 +3,7 @@
 cd "$(dirname "$0")"
 
 _fail() {
+    docker logs connexion-pydantic
     docker rm -f connexion-pydantic > /dev/null 2>&1
     exit 1
 }

diff --git a/examples/flask-httpauth/run_tests.sh b/examples/flask-httpauth/run_tests.sh
@@ -3,6 +3,7 @@
 cd "$(dirname "$0")"
 
 _fail() {
+    docker logs flask-httpauth
     docker rm -f flask-httpauth > /dev/null 2>&1
     exit 1
 }

diff --git a/examples/flask-multi-processes/run_tests.sh b/examples/flask-multi-processes/run_tests.sh
@@ -3,6 +3,7 @@
 cd "$(dirname "$0")"
 
 _fail() {
+    docker logs flask-multi-processes
     docker rm -f flask-multi-processes > /dev/null 2>&1
     exit 1
 }

diff --git a/examples/gunicorn-app-factory/run_tests.sh b/examples/gunicorn-app-factory/run_tests.sh
@@ -3,6 +3,7 @@
 cd "$(dirname "$0")"
 
 _fail() {
+    docker logs gunicorn-app-factory-sample
     docker rm -f gunicorn-app-factory-sample > /dev/null 2>&1
     exit 1
 }

diff --git a/examples/gunicorn-exceptions-113/run_tests.sh b/examples/gunicorn-exceptions-113/run_tests.sh
@@ -3,6 +3,7 @@
 cd "$(dirname "$0")"
 
 _fail() {
+    docker logs gunicorn-sample
     docker rm -f gunicorn-sample > /dev/null 2>&1
     exit 1
 }

diff --git a/examples/gunicorn-internal/run_tests.sh b/examples/gunicorn-internal/run_tests.sh
@@ -3,6 +3,7 @@
 cd "$(dirname "$0")"
 
 _fail() {
+    docker logs gunicorn-internal-sample
     docker rm -f gunicorn-internal-sample > /dev/null 2>&1
     exit 1
 }

diff --git a/examples/gunicorn-multiprocess-109/run_tests.sh b/examples/gunicorn-multiprocess-109/run_tests.sh
@@ -3,6 +3,7 @@
 cd "$(dirname "$0")"
 
 _fail() {
+    docker logs gunicorn-sample
     docker rm -f gunicorn-sample > /dev/null 2>&1
     exit 1
 }

diff --git a/examples/gunicorn/run_tests.sh b/examples/gunicorn/run_tests.sh
@@ -3,6 +3,7 @@
 cd "$(dirname "$0")"
 
 _fail() {
+    docker logs gunicorn-sample
     docker rm -f gunicorn-sample > /dev/null 2>&1
     exit 1
 }

diff --git a/examples/pytest-app-factory/run_tests.sh b/examples/pytest-app-factory/run_tests.sh
@@ -3,6 +3,7 @@
 cd "$(dirname "$0")"
 
 _fail() {
+    docker logs pytest-sample
     docker rm -f pytest-sample > /dev/null 2>&1
     exit 1
 }

diff --git a/examples/reload/run_tests.sh b/examples/reload/run_tests.sh
@@ -3,6 +3,7 @@
 cd "$(dirname "$0")"
 
 _fail() {
+    docker logs reload-sample
     docker rm -f reload-sample > /dev/null 2>&1
     exit 1
 }

diff --git a/examples/restful-with-blueprints/run_tests.sh b/examples/restful-with-blueprints/run_tests.sh
@@ -3,6 +3,7 @@
 cd "$(dirname "$0")"
 
 _fail() {
+    docker logs restful-with-blueprints
     docker rm -f restful-with-blueprints > /dev/null 2>&1
     exit 1
 }

diff --git a/examples/restplus-default-metrics/Dockerfile b/examples/restplus-default-metrics/Dockerfile
@@ -1,6 +1,7 @@
 FROM python:3.8-alpine
 
-RUN apk add --no-cache curl && pip install flask flask-restx prometheus_client
+# werkzeug needs to be pinned due to https://github.com/python-restx/flask-restx/issues/460
+RUN apk add --no-cache curl && pip install flask flask-restx prometheus_client werkzeug==2.0.*
 
 ADD . /tmp/latest
 RUN pip install -e /tmp/latest --upgrade

diff --git a/examples/restplus-default-metrics/run_tests.sh b/examples/restplus-default-metrics/run_tests.sh
@@ -3,7 +3,6 @@
 cd "$(dirname "$0")"
 
 _fail() {
-    echo "Logs from the application:"
     docker logs restplus-default-metrics
     docker rm -f restplus-default-metrics > /dev/null 2>&1
     exit 1
@@ -32,8 +31,6 @@ for _ in $(seq 1 10); do
     fi
 done
 
-curl -s http://localhost:4000/metrics
-
 curl -s http://localhost:4000/metrics \
   | grep 'by_path_counter_total{path="/test"} 10.0' \
   > /dev/null

diff --git a/examples/uwsgi-connexion/run_tests.sh b/examples/uwsgi-connexion/run_tests.sh
@@ -3,6 +3,7 @@
 cd "$(dirname "$0")"
 
 _fail() {
+    docker logs uwsgi-connexion
     docker rm -f uwsgi-connexion > /dev/null 2>&1
     exit 1
 }

diff --git a/examples/uwsgi/run_tests.sh b/examples/uwsgi/run_tests.sh
@@ -3,6 +3,7 @@
 cd "$(dirname "$0")"
 
 _fail() {
+    docker logs uwsgi-sample
     docker rm -f uwsgi-sample > /dev/null 2>&1
     exit 1
 }