# HG changeset patch
# User Thomas De Schampheleire <thomas.de.schamphele...@gmail.com>
# Date 1473428048 -7200
#      Fri Sep 09 15:34:08 2016 +0200
# Node ID 94a4bb081fa85ce9ecbefceafe104e3c4f03109e
# Parent  7e0969f34a4cff5788f4815c7e66c441158666fc
tests: fix assertion rewriting in some tests with pytest-3.0.0+

Since pytest 3.0.0, asserts present in modules that are not directly seen by
pytest as 'test modules', are no longer rewritten to have improved
reporting, unless they are explicitly marked as up-for-rewriting.
Rationale from pytest upstream:

    However since we do not want to test different bytecode then you will
    run in production this hook only re-writes test modules themselves as
    well as any modules which are part of plugins. Any other imported module
    will not be re-written and normal assertion behaviour will happen.

This is e.g. the case for asserts in files like
kallithea/tests/api/api_base.py and kallithea/tests/models/common.py.


This commit registers all modules below kallithea.tests for assert
rewriting, but note that asserts in kallithea/tests/__init__.py itself are
not rewritten as kallithea.tests is already imported when the register
statement is encountered.
Moving the register statement to kallithea/__init__.py would fix that, but
even then asserts in kallithea/tests/__init__.py seem not to be rewritten
(let alone the issue that we do not want a pytest dependency enforced in
kallithea/__init__.py which is also used in production).
Moving out some of the code from kallithea/tests/__init__.py to a proper
module, as suggested by Mads Kiilerich, is assumed to solve that problem.

diff --git a/kallithea/tests/__init__.py b/kallithea/tests/__init__.py
--- a/kallithea/tests/__init__.py
+++ b/kallithea/tests/__init__.py
@@ -25,6 +25,10 @@ Refer to docs/contributing.rst for detai
 import pytest
+# make sure that all asserts under kallithea/tests benefit from advanced assert
+# reporting, before importing these modules.
 from kallithea.tests.base import *
 __all__ = [
kallithea-general mailing list

Reply via email to