Commit c58c107a authored by Petr Špaček's avatar Petr Špaček Committed by Tomas Krizek

pytest: restructure directory structure

These changes eliminate risk that `make check` or py.test runner will
confuse Deckard scenarios. Also, `tests/` subdirectory is meant for
tests for Deckard itself, so Deckard infrastructure was moved to
top-level directory.
parent 15f4ca8d
......@@ -54,4 +54,4 @@ $(libcwrap): $(libcwrap_cmake_DIR)/Makefile
check:
@echo Running unittests using pytest
${PYTHON} -m pytest --ignore=tests/test_runner.py
${PYTHON} -m pytest
[pytest]
log_print = False
python_files=deckard_pytest.py
norecursedirs=*
[pytest]
log_print = False
\ No newline at end of file
......@@ -8,4 +8,4 @@ source "${MAKEDIR}/env.sh"
# compatibility with old TESTS= env variable
# add --scenarios= only if the variable TESTS is non-empty
python3 -m pytest -v tests/test_runner.py ${DECKARDFLAGS:-} ${TESTS:+"--scenarios=${TESTS}"} "$@"
python3 -m pytest -c deckard_pytest.ini ${DECKARDFLAGS:-} ${TESTS:+"--scenarios=${TESTS}"} "$@"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment