<!DOCTYPE html>
<html>
<head>
</head>
<body style='font: 12pt Roboto, "DejaVu Sans", Arial; margin-left: 5px; margin-right: 5px;'>
<div id="entry">
<h1 style='font: 12pt Roboto, "DejaVu Sans", Arial; display:block; background: #c0cf88; border-bottom: solid 3px #573; padding: 5px; margin-top: 0px; color: #573;'><a href="https://kallithea-scm.org/repos/kallithea/changeset/49c82acd30b27b56f1eabd937eec73fecaf35993" style="text-decoration: none; font-weight: bold; color: #573;">scripts: fix X mode on code formatting scripts</a></h1>
<div id="body">
kiilerix committed on 2016-09-19 20:39:26<br />branch: default<br />changeset: <a href="https://kallithea-scm.org/repos/kallithea/changeset/49c82acd30b27b56f1eabd937eec73fecaf35993">49c82acd</a><pre>scripts: fix X mode on code formatting scripts
M docs/usage/performance.rst (1 lines added, 1 lines removed)
M scripts/dbmigrate-test (0 lines added, 0 lines removed)
M scripts/generate-ini.py (0 lines added, 0 lines removed)</pre>
</div>
</div>
</div>
</body>
</html>
<!DOCTYPE html>
<html>
<head>
</head>
<body style='font: 12pt Roboto, "DejaVu Sans", Arial; margin-left: 5px; margin-right: 5px;'>
<div id="entry">
<h1 style='font: 12pt Roboto, "DejaVu Sans", Arial; display:block; background: #c0cf88; border-bottom: solid 3px #573; padding: 5px; margin-top: 0px; color: #573;'><a href="https://kallithea-scm.org/repos/kallithea/changeset/8d98924c58b14869ddcd212d7784d6b1eb8e0a59" style="text-decoration: none; font-weight: bold; color: #573;">tests: add as little code as possible in __init__.py kallithea/tests/__init__.py contained quite a lot of code, including the test base class TestController...</a></h1>
<div id="body">
patrickdp committed on 2016-09-18 19:44:21<br />branch: default<br />changeset: <a href="https://kallithea-scm.org/repos/kallithea/changeset/8d98924c58b14869ddcd212d7784d6b1eb8e0a59">8d98924c</a><pre>tests: add as little code as possible in __init__.py
kallithea/tests/__init__.py contained quite a lot of code, including the test
base class TestController. This in itself may be considered bad practice.
Specifically, this poses a problem when using pytest 3.0+, in which asserts
in some files are not automatically rewritten to give improved assert
output. That problem can be fixed by explicitly registering such files for
assertion rewriting, but that register call should be executed _before_ said
files are imported. I.e. if the register call is in
kallithea/tests/__init__.py, assert calls in __init__.py itself can not be
rewritten.
Since the TestController base class does effectively contain asserts, and we
do not want to execute the register call from somewhere outside the
kallithea/tests directory, we need to move the TestController class to
another file (kallithea/tests/base.py) so we can have a register call in
__init__.py before loading base.py.
While not strictly necessary to fix the mentioned pytest problem, we take
the opportunity to fully clean __init__.py and move everything to
the new kallithea/tests/base.py. While doing so, unnecessary imports are
removed, and imports are ordered alphabetically. Explicit imports of symbols
from modules that were already imported as a whole, are removed in favor of
fully qualifying the references (e.g. tempfile._RandomNameSequence).
M kallithea/config/environment.py (1 lines added, 1 lines removed)
M kallithea/lib/db_manage.py (1 lines added, 1 lines removed)
M kallithea/lib/utils.py (1 lines added, 1 lines removed)
M kallithea/tests/__init__.py (0 lines added, 211 lines removed)
M kallithea/tests/api/api_base.py (1 lines added, 1 lines removed)
M kallithea/tests/api/test_api_git.py (1 lines added, 1 lines removed)
M kallithea/tests/api/test_api_hg.py (1 lines added, 1 lines removed)
M kallithea/tests/base.py (6 lines added, 17 lines removed)
M kallithea/tests/conftest.py (1 lines added, 1 lines removed)
M kallithea/tests/fixture.py (1 lines added, 1 lines removed)
M kallithea/tests/functional/test_admin.py (1 lines added, 1 lines removed)
M kallithea/tests/functional/test_admin_auth_settings.py (1 lines added, 1 lines removed)
M kallithea/tests/functional/test_admin_defaults.py (1 lines added, 1 lines removed)
M kallithea/tests/functional/test_admin_gists.py (1 lines added, 1 lines removed)
M kallithea/tests/functional/test_admin_notifications.py (1 lines added, 1 lines removed)
M kallithea/tests/functional/test_admin_permissions.py (1 lines added, 1 lines removed)
M kallithea/tests/functional/test_admin_repo_groups.py (1 lines added, 1 lines removed)
M kallithea/tests/functional/test_admin_repos.py (1 lines added, 1 lines removed)
M kallithea/tests/functional/test_admin_settings.py (1 lines added, 1 lines removed)
M kallithea/tests/functional/test_admin_user_groups.py (1 lines added, 1 lines removed)
M kallithea/tests/functional/test_admin_users.py (1 lines added, 1 lines removed)
M kallithea/tests/functional/test_changelog.py (1 lines added, 1 lines removed)
M kallithea/tests/functional/test_changeset.py (1 lines added, 1 lines removed)
M kallithea/tests/functional/test_changeset_comments.py (1 lines added, 1 lines removed)
M kallithea/tests/functional/test_compare.py (1 lines added, 1 lines removed)
M kallithea/tests/functional/test_compare_local.py (1 lines added, 1 lines removed)
M kallithea/tests/functional/test_feed.py (1 lines added, 1 lines removed)
M kallithea/tests/functional/test_files.py (1 lines added, 1 lines removed)
M kallithea/tests/functional/test_followers.py (1 lines added, 1 lines removed)
M kallithea/tests/functional/test_forks.py (1 lines added, 1 lines removed)
M kallithea/tests/functional/test_home.py (1 lines added, 1 lines removed)
M kallithea/tests/functional/test_journal.py (1 lines added, 1 lines removed)
M kallithea/tests/functional/test_login.py (1 lines added, 1 lines removed)
M kallithea/tests/functional/test_my_account.py (1 lines added, 1 lines removed)
M kallithea/tests/functional/test_pullrequests.py (1 lines added, 1 lines removed)
M kallithea/tests/functional/test_repo_groups.py (1 lines added, 1 lines removed)
M kallithea/tests/functional/test_search.py (1 lines added, 1 lines removed)
M kallithea/tests/functional/test_summary.py (1 lines added, 1 lines removed)
M kallithea/tests/models/common.py (1 lines added, 1 lines removed)
M kallithea/tests/models/test_changeset_status.py (1 lines added, 1 lines removed)
M kallithea/tests/models/test_diff_parsers.py (1 lines added, 1 lines removed)
M kallithea/tests/models/test_notifications.py (1 lines added, 1 lines removed)
M kallithea/tests/models/test_permissions.py (1 lines added, 1 lines removed)
M kallithea/tests/models/test_repo_groups.py (1 lines added, 1 lines removed)
M kallithea/tests/models/test_repos.py (1 lines added, 1 lines removed)
M kallithea/tests/models/test_user_groups.py (1 lines added, 1 lines removed)
M kallithea/tests/models/test_users.py (1 lines added, 1 lines removed)
M kallithea/tests/other/manual_test_vcs_operations.py (1 lines added, 1 lines removed)
M kallithea/tests/other/test_libs.py (1 lines added, 1 lines removed)
M kallithea/tests/other/test_mail.py (1 lines added, 1 lines removed)
M kallithea/tests/other/test_validators.py (1 lines added, 1 lines removed)
M kallithea/tests/scripts/manual_test_concurrency.py (1 lines added, 1 lines removed)
M kallithea/tests/vcs/__init__.py (1 lines added, 1 lines removed)
M kallithea/tests/vcs/conf.py (1 lines added, 1 lines removed)</pre>
</div>
</div>
</div>
</body>
</html>
<!DOCTYPE html>
<html>
<head>
</head>
<body style='font: 12pt Roboto, "DejaVu Sans", Arial; margin-left: 5px; margin-right: 5px;'>
<div id="entry">
<h1 style='font: 12pt Roboto, "DejaVu Sans", Arial; display:block; background: #c0cf88; border-bottom: solid 3px #573; padding: 5px; margin-top: 0px; color: #573;'><a href="https://kallithea-scm.org/repos/kallithea/changeset/790aeeddcab598d2aacbbecf86830b608ca8b32b" style="text-decoration: none; font-weight: bold; color: #573;">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...</a></h1>
<div id="body">
patrickdp committed on 2016-09-09 13:34:08<br />branch: default<br />tag: tip<br />changeset: <a href="https://kallithea-scm.org/repos/kallithea/changeset/790aeeddcab598d2aacbbecf86830b608ca8b32b">790aeedd</a><pre>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.
See
<a href="http://doc.pytest.org/en/latest/changelog.html#id13">http://doc.pytest.org/en/latest/changelog.html#id13</a>
<a href="http://doc.pytest.org/en/latest/writing_plugins.html#assertion-rewriting">http://doc.pytest.org/en/latest/writing_plugins.html#assertion-rewriting</a>
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 the code from kallithea/tests/__init__.py to a proper module, as
suggested by Mads Kiilerich, solves that problem.
M kallithea/tests/__init__.py (4 lines added, 0 lines removed)</pre>
</div>
</div>
</div>
</body>
</html>