Mercurial > kallithea
changeset 5146:08ad393e6866
tests: move pytest settings from kallithea/tests/pytest.ini to setup.cfg
pytest.ini was added in 9b8ba0f1c87b but didn't work. pytest only uses one
configuration file and does not merge settings from multiple files [1]. The
first detected file is setup.cfg thus should contain all relevant
configuration.
[1] http://pytest.org/latest/customize.html#initialization-determining-rootdir-and-inifile
| author | Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> |
|---|---|
| date | Thu, 14 May 2015 21:05:47 +0200 |
| parents | 7187c1707eda |
| children | 45725b774525 |
| files | kallithea/tests/pytest.ini setup.cfg |
| diffstat | 2 files changed, 6 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/tests/pytest.ini Thu May 14 21:42:26 2015 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ -[pytest] -addopts = - # --verbose - # show extra test summary info as specified by chars (f)ailed, (E)error, (s)skipped, (x)failed, (X)passed, (w)warnings. - -rfEsxXw - # Shorter scrollbacks; less stuff to scroll through - --tb=short
--- a/setup.cfg Thu May 14 21:42:26 2015 +0200 +++ b/setup.cfg Thu May 14 21:05:47 2015 +0200 @@ -13,6 +13,12 @@ [pytest] # only look for tests in kallithea/tests python_files = kallithea/tests/**/test_*.py +addopts = + # --verbose + # show extra test summary info as specified by chars (f)ailed, (E)error, (s)skipped, (x)failed, (X)passed, (w)warnings. + -rfEsxXw + # Shorter scrollbacks; less stuff to scroll through + --tb=short [compile_catalog] domain = kallithea