Skip to content

D
deckard
Commit 5fae6986 authored by Petr Špaček's avatar Petr Špaček
Browse files
Options

Merge branch 'fix-logging' into 'master' 

logging: fix output for both Python 3.5 and 3.6+

See merge request !128
parents 7cafa9ec 5708002a
Pipeline #39054 passed with stage
    in 1 minute and 20 seconds
    Hide whitespace changes
    Inline Side-by-side
    Showing with 2 additions and 1 deletion
    deckard_pytest.ini
    View file @ 5fae6986
    [pytest]
    log_print = true
    python_files=deckard_pytest.py
    norecursedirs=*
    log_cli=true
    ......
    run.sh
    View file @ 5fae6986
    ......@@ -9,4 +9,4 @@ source "${MAKEDIR}/env.sh"
    # compatibility with old TESTS= env variable
    # add --scenarios= only if the variable TESTS is non-empty
    python3 -m pytest -c "${MAKEDIR}/deckard_pytest.ini" ${VERBOSE:-"--log-level=40"} ${VERBOSE:+"--log-level=10"} "${MAKEDIR}" ${DECKARDFLAGS:-} ${TESTS:+"--scenarios=${TESTS}"} "$@"
    python3 -m pytest -c "${MAKEDIR}/deckard_pytest.ini" --tb=short -q ${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