From 955e6aa1bbb35f18c89ee7748e1ed8a8a6bae8f3 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Mon, 3 Mar 2014 02:31:04 -0500 Subject: framework agnostic coverage flag --- lib/sqlalchemy/testing/plugin/noseplugin.py | 2 ++ lib/sqlalchemy/testing/plugin/plugin_base.py | 3 +++ lib/sqlalchemy/testing/plugin/pytestplugin.py | 3 +++ 3 files changed, 8 insertions(+) (limited to 'lib/sqlalchemy/testing') diff --git a/lib/sqlalchemy/testing/plugin/noseplugin.py b/lib/sqlalchemy/testing/plugin/noseplugin.py index 0e8676b49..bbc4beaf9 100644 --- a/lib/sqlalchemy/testing/plugin/noseplugin.py +++ b/lib/sqlalchemy/testing/plugin/noseplugin.py @@ -49,6 +49,8 @@ class NoseSQLAlchemy(Plugin): super(NoseSQLAlchemy, self).configure(options, conf) plugin_base.pre_begin(options) + plugin_base.set_coverage_flag(options.enable_plugin_coverage) + global fixtures from sqlalchemy.testing import fixtures diff --git a/lib/sqlalchemy/testing/plugin/plugin_base.py b/lib/sqlalchemy/testing/plugin/plugin_base.py index 6fd2e7f33..460494719 100644 --- a/lib/sqlalchemy/testing/plugin/plugin_base.py +++ b/lib/sqlalchemy/testing/plugin/plugin_base.py @@ -92,6 +92,9 @@ def pre_begin(opt): for fn in pre_configure: fn(options, file_config) +def set_coverage_flag(value): + options.has_coverage = value + def post_begin(): """things to set up later, once we know coverage is running.""" # Lazy setup of other options (post coverage) diff --git a/lib/sqlalchemy/testing/plugin/pytestplugin.py b/lib/sqlalchemy/testing/plugin/pytestplugin.py index d1c3c47d3..34410afa6 100644 --- a/lib/sqlalchemy/testing/plugin/pytestplugin.py +++ b/lib/sqlalchemy/testing/plugin/pytestplugin.py @@ -23,6 +23,9 @@ def pytest_addoption(parser): def pytest_configure(config): plugin_base.pre_begin(config.option) + + plugin_base.set_coverage_flag(bool(getattr(config.option, "cov_source", False))) + plugin_base.post_begin() # because it feels icky importing from "_pytest".. -- cgit v1.2.1