From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sat, 17 Jan 2015 17:46:20 +0000 (-0500)
Subject: - add an exclusion here that helps with the case of 3rd party
X-Git-Tag: rel_0_9_9~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=96ef0bf768c8073d999888c3afba248442db5b93;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- 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 11238bbac4..a5f6f72fac 100644
--- 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 e6d642ced3..3820a7721a 100644
--- a/test/dialect/test_suite.py
+++ b/test/dialect/test_suite.py
@@ -1,2 +1,3 @@
 from sqlalchemy.testing.suite import *
 
+