Mercurial > kallithea
changeset 8157:56de50d57ff0
pytest: fix register_assert_rewrite call
Since a while, the test suite shows following warning:
kallithea/tests/__init__.py:29
/home/tdescham/repo/contrib/kallithea/kallithea-review/kallithea/tests/__init__.py:29: PytestAssertRewriteWarning: Module already imported so cannot be rewritten: kallithea.tests
pytest.register_assert_rewrite('kallithea.tests')
The problem can be fixed by moving the register_assert_rewrite call from
kallithea/tests/__init__.py to the root-level conftest.py, outside of the
'kallithea' module.
| author | Thomas De Schampheleire <thomas.de_schampheleire@nokia.com> |
|---|---|
| date | Tue, 04 Feb 2020 20:08:41 +0100 |
| parents | 24db2cd42881 |
| children | 6e96ade2402e |
| files | conftest.py kallithea/tests/__init__.py |
| diffstat | 2 files changed, 7 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/conftest.py Mon Feb 03 20:56:41 2020 +0100 +++ b/conftest.py Tue Feb 04 20:08:41 2020 +0100 @@ -36,3 +36,10 @@ m = __import__(request.module.__name__, globals(), locals(), [None], 0) with mock.patch.object(m, '_', lambda s: s): yield + +if getattr(pytest, 'register_assert_rewrite', None): + # make sure that all asserts under kallithea/tests benefit from advanced + # assert reporting with pytest-3.0.0+, including api/api_base.py, + # models/common.py etc. + # See also: https://docs.pytest.org/en/latest/assert.html#advanced-assertion-introspection + pytest.register_assert_rewrite('kallithea.tests')
--- a/kallithea/tests/__init__.py Mon Feb 03 20:56:41 2020 +0100 +++ b/kallithea/tests/__init__.py Tue Feb 04 20:08:41 2020 +0100 @@ -17,13 +17,3 @@ Refer to docs/contributing.rst for details on running the test suite. """ - -import pytest - - -if getattr(pytest, 'register_assert_rewrite', None): - # make sure that all asserts under kallithea/tests benefit from advanced - # assert reporting with pytest-3.0.0+, including api/api_base.py, - # models/common.py etc. - # See also: https://docs.pytest.org/en/latest/assert.html#advanced-assertion-introspection - pytest.register_assert_rewrite('kallithea.tests')