Commit 1e55bd65 authored by Petr Špaček's avatar Petr Špaček
Browse files

Merge branch 'fix-logging' into 'master'

logging: print Deckard errors in pytest output again

See merge request !127
parents 8b0bc194 f626bcd9
Pipeline #38974 failed with stage
in 1 minute and 29 seconds
[pytest] [pytest]
log_print = False
python_files=deckard_pytest.py python_files=deckard_pytest.py
norecursedirs=* norecursedirs=*
log_cli=true
...@@ -2,5 +2,5 @@ dnspython>=1.15 ...@@ -2,5 +2,5 @@ dnspython>=1.15
Jinja2>=2.8 Jinja2>=2.8
PyYAML PyYAML
python-augeas python-augeas
pytest pytest>=3.4
pytest-xdist pytest-xdist
...@@ -9,4 +9,4 @@ source "${MAKEDIR}/env.sh" ...@@ -9,4 +9,4 @@ source "${MAKEDIR}/env.sh"
# compatibility with old TESTS= env variable # compatibility with old TESTS= env variable
# add --scenarios= only if the variable TESTS is non-empty # add --scenarios= only if the variable TESTS is non-empty
python3 -m pytest -c "${MAKEDIR}/deckard_pytest.ini" "${MAKEDIR}" ${DECKARDFLAGS:-} ${TESTS:+"--scenarios=${TESTS}"} "$@" python3 -m pytest -c "${MAKEDIR}/deckard_pytest.ini" ${VERBOSE:-"--log-level=40"} ${VERBOSE:+"--log-level=10"} "${MAKEDIR}" ${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