mirror of
https://github.com/tbabej/taskwiki.git
synced 2025-08-18 21:33:07 +02:00
tests: Really move command from docker-compose.yml to Makefile
This makes it easier to understand the interaction between the outer and inner make, as one doesn't need to dig through docker-compose.yml and possibly Dockerfile to find what command will be run. It does break the ability to run `docker-compose run --rm tests` but that's a good thing I believe: I only ever use that when I need a shell in the container for debugging purposes.
This commit is contained in:
parent
15ce16f24c
commit
58af37436e
2 changed files with 1 additions and 2 deletions
2
Makefile
2
Makefile
|
@ -3,7 +3,7 @@ export LC_ALL := en_US.UTF-8
|
||||||
PYTHON ?= python3
|
PYTHON ?= python3
|
||||||
|
|
||||||
test:
|
test:
|
||||||
docker-compose run --rm tests
|
docker-compose run --rm tests make xvfb-cover-pytest
|
||||||
|
|
||||||
pytest:
|
pytest:
|
||||||
$(PYTHON) -m pytest -vv $(PYTEST_FLAGS) tests/
|
$(PYTHON) -m pytest -vv $(PYTEST_FLAGS) tests/
|
||||||
|
|
|
@ -8,7 +8,6 @@ services:
|
||||||
security_opt:
|
security_opt:
|
||||||
- label=type:container_runtime_t
|
- label=type:container_runtime_t
|
||||||
tty: true
|
tty: true
|
||||||
command: make xvfb-cover-pytest
|
|
||||||
environment:
|
environment:
|
||||||
PYTEST_FLAGS: "-o cache_dir=/tmp/pytest-cache ${PYTEST_FLAGS:-}"
|
PYTEST_FLAGS: "-o cache_dir=/tmp/pytest-cache ${PYTEST_FLAGS:-}"
|
||||||
TRAVIS:
|
TRAVIS:
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue