# HG changeset patch
# User Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
# Date 1580843321 -3600
# Node ID 56de50d57ff0145f30d8809b85105108a6a35a75
# Parent  24db2cd4288155fbd3e017be6636f8db868aa6b6
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.

diff -r 24db2cd42881 -r 56de50d57ff0 conftest.py
--- 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')
diff -r 24db2cd42881 -r 56de50d57ff0 kallithea/tests/__init__.py
--- 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')