get tests working in docker container

hjwp · hjwp · commit ac20eeff2da4 · 2020-01-03T01:03:54.000Z
diff --git a/.travis.yml b/.travis.yml
@@ -2,9 +2,6 @@ dist: xenial
 language: python
 python: 3.8
 
-install:
-- pip3 install -r requirements.txt
-
 script:
 - make all
 
diff --git a/Makefile b/Makefile
@@ -4,10 +4,22 @@ build:
 up:
 	docker-compose up -d app
 
-test:
-	pytest --tb=short
+test: up
+	docker-compose run --rm --no-deps --entrypoint=pytest app /tests/unit /tests/integration /tests/e2e
+
+unit-tests:
+	docker-compose run --rm --no-deps --entrypoint=pytest app /tests/unit
+
+integration-tests: up
+	docker-compose run --rm --no-deps --entrypoint=pytest app /tests/integration
+
+e2e-tests: up
+	docker-compose run --rm --no-deps --entrypoint=pytest app /tests/e2e
 
 logs:
 	docker-compose logs app | tail -100
 
-all: build up test
+down:
+	docker-compose down --remove-orphans
+
+all: down build up test
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -10,8 +10,11 @@ services:
     environment:
       - DB_HOST=postgres
       - DB_PASSWORD=abc123
+      - API_HOST=app
+      - PYTHONDONTWRITEBYTECODE=1
     volumes:
       - ./src:/src
+      - ./tests:/tests
     ports:
       - "5005:80"
 
diff --git a/tests/__init__.py b/tests/__init__.py
diff --git a/tests/mypy.ini b/tests/mypy.ini
diff --git a/tests/pytest.ini b/tests/pytest.ini
@@ -0,0 +1,2 @@
+[pytest]
+addopts = --tb=short
