- fixes to multi-backend tests

- move the logic to determine "test id" into plugin_base
- update callcounts

1 files changed, 2 insertions, 10 deletions

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)