Fixes currently failing test (#455)

* fix test_async_processing_new

* switch except error order

Makefile

@@ -10,13 +10,13 @@ install:
 	pip3 install .
 
 test:
-	./tests_with_redis.sh
+	sh ./tests_with_redis.sh
 
 unittest:
 	pytest -m unittest
 
 devtest:
-	./tests_with_redis.sh dev
+	sh ./tests_with_redis.sh dev
 
 integrationtest:
-	./tests_with_redis.sh integrationtest
+	sh ./tests_with_redis.sh integrationtest

docker/actinia-core-tests/Dockerfile

@@ -41,16 +41,13 @@ RUN grass --tmp-location EPSG:4326 --exec g.extension -s \
 COPY docker/actinia-core-alpine/actinia.cfg /etc/default/actinia
 COPY docker/actinia-core-tests/actinia-test.cfg /etc/default/actinia_test
 
-COPY requirements.txt /src/requirements.txt
-RUN pip3 install -r /src/requirements.txt
 RUN pip3 install pytest pytest-cov
 
 # TODO: Postgres for tests
 # using tests/data/poly.gpkg
 
 COPY . /src/actinia_core
 WORKDIR /src/actinia_core
-RUN chmod a+x tests_with_redis.sh
 
 RUN make install
 

src/actinia_core/cli/webhook_server.py

@@ -29,7 +29,7 @@
 import psutil
 from flask import Flask, make_response, jsonify, request, json
 from multiprocessing import Process
-from werkzeug.exceptions import BadRequest
+from werkzeug.exceptions import BadRequest, UnsupportedMediaType
 
 from pprint import pprint
 
@@ -44,10 +44,13 @@
 
 @flask_app.route("/webhook/finished", methods=["GET", "POST"])
 def finished():
+
     try:
         pprint(json.loads(request.get_json()))
     except BadRequest:
         pass
+    except UnsupportedMediaType:
+        pass
     except TypeError:
         pass
     return make_response(jsonify("OK"), 200)
@@ -59,6 +62,8 @@ def update():
         pprint(json.loads(request.get_json()))
     except BadRequest:
         pass
+    except UnsupportedMediaType:
+        pass
     except TypeError:
         pass
     return make_response(jsonify("OK"), 200)

src/actinia_core/cli/webhook_server_broken.py

@@ -29,7 +29,7 @@
 import psutil
 from flask import Flask, make_response, jsonify, request, json
 from multiprocessing import Process
-from werkzeug.exceptions import BadRequest
+from werkzeug.exceptions import BadRequest, UnsupportedMediaType
 
 from pprint import pprint
 
@@ -49,6 +49,8 @@ def finished():
         pprint(json.loads(request.get_json()))
     except BadRequest:
         pass
+    except UnsupportedMediaType:
+        pass
     except TypeError:
         pass
     sp = Process(target=shutdown_server, args=(port,))
@@ -62,6 +64,8 @@ def update():
         pprint(json.loads(request.get_json()))
     except BadRequest:
         pass
+    except UnsupportedMediaType:
+        pass
     except TypeError:
         pass
     return make_response(jsonify("OK"), 200)