Merge pull request #4 from FinnStutzenstein/openslides4-dev-integration

Small rework regarding tests for the big setup.

Dockerfile

@@ -5,7 +5,6 @@ RUN apt-get -y update && apt-get -y upgrade && \
     postgresql-client
 
 WORKDIR /app
-#ENV FLASK_APP mediafileserver.py
 
 COPY requirements_production.txt requirements_production.txt
 RUN pip install -r requirements_production.txt

Dockerfile.dev

@@ -6,18 +6,19 @@ RUN apt-get -y update && apt-get -y upgrade && \
 
 WORKDIR /app
 
-COPY requirements_production.txt requirements_production.txt
-RUN pip install -r requirements_production.txt
-COPY requirements_development.txt requirements_development.txt
+COPY requirements_production.txt .
+COPY requirements_development.txt .
 RUN pip install -r requirements_development.txt
 
 COPY entrypoint.sh .
+COPY execute-cleanup.sh .
+COPY setup.cfg .
 
 EXPOSE 9006
 # TODO: Make the port configurable via ENV
-ENTRYPOINT ["./entrypoint.sh"]
 
 ENV FLASK_APP ./src/mediaserver.py
 ENV FLASK_ENV development
 
+ENTRYPOINT ["./entrypoint.sh"]
 CMD ["flask", "run", "--host", "0.0.0.0", "--port", "9006"]

Dockerfile.tests

@@ -7,10 +7,5 @@ WORKDIR /app
 
 COPY requirements_tests.txt requirements_tests.txt
 RUN pip install -r requirements_tests.txt
-COPY requirements_development.txt requirements_development.txt
-RUN pip install -r requirements_development.txt
 
-COPY entrypoint-tests.sh .
-COPY setup.cfg .
-
-ENTRYPOINT ["./entrypoint-tests.sh"]
+CMD ["bash", "-c", "sleep infinity"]

Makefile

@@ -3,3 +3,12 @@ build-dev:
 
 build-tests:
 	docker build . -f Dockerfile.tests --tag openslides-media-tests
+
+run-tests: | build-dev build-tests
+	docker-compose -f docker-compose.test.yml up -d
+	docker-compose -f docker-compose.test.yml exec tests wait-for-it "media:9006"
+	docker-compose -f docker-compose.test.yml exec tests pytest
+	docker-compose -f docker-compose.test.yml down
+
+run-cleanup: | build-dev
+	docker run -ti --entrypoint="" -v `pwd`/src:/app/src -v `pwd`/tests:/app/tests openslides-media-dev bash -c "./execute-cleanup.sh"

README.md

@@ -11,8 +11,6 @@ variables. Configs without default must be specified. All configs (see
 
 - `URL_PREFIX`: Default `/media/`. The prefix, the server listens to. E.g. for
   the default, all files must be requested this way: `/media/<path>`.
-- `CHECK_REQUEST_URL`: The url to make the chack request to. The host and port
-  must be given. E.g.: `worker:9006/check-media/`
 - `DB_HOST`, `DB_PORT`, `DB_NAME`, `DB_USER`, `DB_PASSWORD`: The host, port,
   database name, user and password for the mediafile db
 - `BLOCK_SIZE`: Default 4096. The size of the blocks, the file is chunked into.

docker-compose-test.yml → docker-compose.test.yml

@@ -14,7 +14,6 @@ services:
             - MEDIA_DATABASE_NAME=openslides
             - MEDIA_DATABASE_USER=openslides
             - MEDIA_DATABASE_PASSWORD=openslides
-            - CHECK_REQUEST_URL=test/
         volumes:
             - ./src:/app/src
         ports:
@@ -26,4 +25,3 @@ services:
             - media-postgresql
         volumes:
             - ./tests:/app/tests
-            - ./src:/app/src

docker-compose.yml

@@ -14,7 +14,6 @@ services:
             - MEDIA_DATABASE_NAME=openslides
             - MEDIA_DATABASE_USER=openslides
             - MEDIA_DATABASE_PASSWORD=openslides
-            - CHECK_REQUEST_URL=test/
         volumes:
             - ./src:/app/src
         ports:

entrypoint.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e
 
 export MEDIA_DATABASE_HOST="${MEDIA_DATABASE_HOST:-db}"
 export MEDIA_DATABASE_PORT="${MEDIA_DATABASE_PORT:-5432}"

execute-cleanup.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+printf "Black:\n"
+black src/ tests/
+printf "\nIsort:\n"
+isort src/ tests/
+printf "\nFlake8:\n"
+flake8 src/ tests/

requirements_development.txt

@@ -1,3 +1,5 @@
+-r requirements_production.txt
+
 flake8
 black
 isort

src/auth.py

@@ -5,6 +5,8 @@
 
 def get_mediafile_id(meeting_id, path, app, cookie):
     return meeting_id
+
+    # TODO: Enable the call to the presenter
     check_request_url = get_check_request_url(meeting_id, path, app)
     app.logger.debug(f"Send check request: {check_request_url}")
 
@@ -29,8 +31,7 @@ def get_mediafile_id(meeting_id, path, app, cookie):
     return id
 
 
-def get_check_request_url(meeting_id, path, app):
-    check_request_url = app.config["CHECK_REQUEST_URL"]
-    if not check_request_url.endswith("/"):
-        raise ServerError("The CHECK_REQUEST_URL must end with an slash.")
-    return f"http://{check_request_url}/{meeting_id}/{path}"
+def get_check_request_url():
+    presenter_host = "todo"
+    presenter_port = "todo"
+    return f"http://{presenter_host}:{presenter_port}/system/presenter"

src/config_handling.py

@@ -3,7 +3,7 @@
 
 
 def get_type_for(config_value):
-    if config_value in ["MEDIA_DATABASE_PORT", "BLOCK_SIZE"]:
+    if config_value in ("MEDIA_DATABASE_PORT", "BLOCK_SIZE"):
         return int
     return str
 
@@ -15,7 +15,6 @@ def get_default_for(config_value):
 
 def init_config(app):
     all_configs = (
-        "CHECK_REQUEST_URL",
         "MEDIA_DATABASE_HOST",
         "MEDIA_DATABASE_PORT",
         "MEDIA_DATABASE_NAME",