♻️ Simplify tests, run in same backend service (fastapi#152)

remove backend-tests
gusevyaroslove · Apr 19, 2020 · d19f095 · d19f095
1 parent 966cd09
commit d19f095
Show file tree

Hide file tree

Showing 10 changed files with 8 additions and 69 deletions.
diff --git a/{{cookiecutter.project_slug}}/.env b/{{cookiecutter.project_slug}}/.env
@@ -1,5 +1,5 @@
 COMPOSE_PATH_SEPARATOR=:
-COMPOSE_FILE=docker-compose.test.yml:docker-compose.shared.admin.yml:docker-compose.shared.base-images.yml:docker-compose.shared.depends.yml:docker-compose.shared.env.yml:docker-compose.dev.build.yml:docker-compose.dev.command.yml:docker-compose.dev.env.yml:docker-compose.dev.labels.yml:docker-compose.dev.networks.yml:docker-compose.dev.ports.yml:docker-compose.dev.volumes.yml
+COMPOSE_FILE=docker-compose.shared.admin.yml:docker-compose.shared.base-images.yml:docker-compose.shared.depends.yml:docker-compose.shared.env.yml:docker-compose.dev.build.yml:docker-compose.dev.command.yml:docker-compose.dev.env.yml:docker-compose.dev.labels.yml:docker-compose.dev.networks.yml:docker-compose.dev.ports.yml:docker-compose.dev.volumes.yml
 
 DOMAIN=localhost
 # DOMAIN=local.dockertoolbox.tiangolo.com

diff --git a/{{cookiecutter.project_slug}}/backend/app/tests-start.sh b/{{cookiecutter.project_slug}}/backend/app/tests-start.sh
@@ -3,4 +3,4 @@ set -e
 
 python /app/app/tests_pre_start.py
 
-pytest $* /app/app/tests/
+pytest "$@" /app/app/tests/
diff --git a/{{cookiecutter.project_slug}}/backend/tests.dockerfile b/{{cookiecutter.project_slug}}/backend/tests.dockerfile
diff --git a/{{cookiecutter.project_slug}}/docker-compose.dev.build.yml b/{{cookiecutter.project_slug}}/docker-compose.dev.build.yml
@@ -12,12 +12,6 @@ services:
       dockerfile: celeryworker.dockerfile
       args: 
         env: dev
-  backend-tests:
-    build:
-      context: ./backend
-      dockerfile: tests.dockerfile
-      args: 
-        env: dev
   frontend:
     build: 
       context: ./frontend

diff --git a/{{cookiecutter.project_slug}}/docker-compose.dev.env.yml b/{{cookiecutter.project_slug}}/docker-compose.dev.env.yml
@@ -9,7 +9,3 @@ services:
       - RUN=celery worker -A app.worker -l info -Q main-queue -c 1
       - JUPYTER=jupyter lab --ip=0.0.0.0 --allow-root --NotebookApp.custom_display_url=http://127.0.0.1:8888
       - SERVER_HOST=http://${DOMAIN}
-  backend-tests:
-    environment:
-      - JUPYTER=jupyter lab --ip=0.0.0.0 --allow-root --NotebookApp.custom_display_url=http://127.0.0.1:8888
-      - SERVER_HOST=http://${DOMAIN}
diff --git a/{{cookiecutter.project_slug}}/docker-compose.dev.volumes.yml b/{{cookiecutter.project_slug}}/docker-compose.dev.volumes.yml
@@ -6,6 +6,3 @@ services:
   celeryworker:
     volumes:
       - ./backend/app:/app
-  backend-tests:
-    volumes:
-      - ./backend/app:/app
diff --git a/{{cookiecutter.project_slug}}/docker-compose.shared.env.yml b/{{cookiecutter.project_slug}}/docker-compose.shared.env.yml
@@ -11,9 +11,13 @@ services:
     environment:
       - SERVER_NAME=${DOMAIN}
       - SERVER_HOST=https://${DOMAIN}
+      # Allow explicit env var override for tests
+      - SMTP_HOST=${SMTP_HOST}
   celeryworker:
     env_file:
       - .env
     environment:
       - SERVER_NAME=${DOMAIN}
       - SERVER_HOST=https://${DOMAIN}
+      # Allow explicit env var override for tests
+      - SMTP_HOST=${SMTP_HOST}
diff --git a/{{cookiecutter.project_slug}}/docker-compose.test.yml b/{{cookiecutter.project_slug}}/docker-compose.test.yml
diff --git a/{{cookiecutter.project_slug}}/scripts/test-local.sh b/{{cookiecutter.project_slug}}/scripts/test-local.sh
@@ -9,7 +9,6 @@ if [ $(uname -s) = "Linux" ]; then
 fi
 
 docker-compose \
-    -f docker-compose.test.yml \
     -f docker-compose.shared.admin.yml \
     -f docker-compose.shared.base-images.yml \
     -f docker-compose.shared.depends.yml \

diff --git a/{{cookiecutter.project_slug}}/scripts/test.sh b/{{cookiecutter.project_slug}}/scripts/test.sh
@@ -3,17 +3,16 @@
 # Exit in case of error
 set -e
 
-DOMAIN=backend \
+DOMAIN=backend SMTP_HOST="" \
 docker-compose \
 -f docker-compose.shared.base-images.yml \
 -f docker-compose.shared.env.yml \
 -f docker-compose.shared.depends.yml \
 -f docker-compose.deploy.build.yml \
--f docker-compose.test.yml \
 config > docker-stack.yml
 
 docker-compose -f docker-stack.yml build
 docker-compose -f docker-stack.yml down -v --remove-orphans # Remove possibly previous broken stacks left hanging after an error
 docker-compose -f docker-stack.yml up -d
-docker-compose -f docker-stack.yml exec -T backend-tests /tests-start.sh "$@"
+docker-compose -f docker-stack.yml exec -T backend bash /app/tests-start.sh "$@"
 docker-compose -f docker-stack.yml down -v --remove-orphans