- add an exclusion here that helps with the case of 3rd party

test suite redefining an existing test in test_suite

Conflicts:
	lib/sqlalchemy/testing/plugin/pytestplugin.py

diff --git a/lib/sqlalchemy/testing/plugin/pytestplugin.py b/lib/sqlalchemy/testing/plugin/pytestplugin.py
index 11238bbac40a82d5fe9ebb301fd83a3908afd0ff..a5f6f72facd1c9f689f71f9d0b1ca93cf32a87a5 100644 (file)
--- a/lib/sqlalchemy/testing/plugin/pytestplugin.py
+++ b/lib/sqlalchemy/testing/plugin/pytestplugin.py
@@ -44,6 +44,10 @@ def pytest_collection_modifyitems(session, config, items):
     # new classes to a module on the fly.
 
     rebuilt_items = collections.defaultdict(list)
+    items[:] = [
+        item for item in
+        items if isinstance(item.parent, pytest.Instance)
+        and not item.parent.parent.name.startswith("_")]
     test_classes = set(item.parent for item in items)
     for test_class in test_classes:
         for sub_cls in plugin_base.generate_sub_tests(

diff --git a/test/dialect/test_suite.py b/test/dialect/test_suite.py
index e6d642ced3e8753315c0dccc8efd451729daa58a..3820a7721a755179bd7a1d9a239fa126e1bb613e 100644 (file)
--- a/test/dialect/test_suite.py
+++ b/test/dialect/test_suite.py
@@ -1,2 +1,3 @@
 from sqlalchemy.testing.suite import *
 
+