From e3a1a2d01c83e9451527b0c5ac316d9a510ac5bc Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Thu, 27 Mar 2014 13:17:20 -0400 Subject: - fixes to multi-backend tests - move the logic to determine "test id" into plugin_base - update callcounts --- lib/sqlalchemy/testing/plugin/pytestplugin.py | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'lib/sqlalchemy/testing/plugin/pytestplugin.py') diff --git a/lib/sqlalchemy/testing/plugin/pytestplugin.py b/lib/sqlalchemy/testing/plugin/pytestplugin.py index f38c7ea6a..74d5cc083 100644 --- a/lib/sqlalchemy/testing/plugin/pytestplugin.py +++ b/lib/sqlalchemy/testing/plugin/pytestplugin.py @@ -112,16 +112,8 @@ def pytest_runtest_teardown(item): test_teardown(item) def test_setup(item): - # like a nose id, e.g.: - # "test.aaa_profiling.test_compiler.CompileTest.test_update_whereclause" - name = item.parent.cls.__name__ - - suffix = "_%s_%s" % (plugin_base.config.db.name, plugin_base.config.db.driver) - if name.endswith(suffix): - name = name[0:-(len(suffix))] - - id_ = "%s.%s.%s" % (item.parent.module.__name__, name, item.name) - plugin_base.before_test(item, id_) + plugin_base.before_test(item, + item.parent.module.__name__, item.parent.cls, item.name) def test_teardown(item): plugin_base.after_test(item) -- cgit v1.2.1