From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sat, 16 Aug 2014 17:33:02 +0000 (-0400)
Subject: - max failures 25
X-Git-Tag: rel_1_0_0b1~216^2~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7fa595221400d168a7bb78551d45379290db195f;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- max failures 25
- guard against some potential pytest snarkiness
---

diff --git a/lib/sqlalchemy/testing/plugin/pytestplugin.py b/lib/sqlalchemy/testing/plugin/pytestplugin.py
index f4c9efd554..0059429133 100644
--- a/lib/sqlalchemy/testing/plugin/pytestplugin.py
+++ b/lib/sqlalchemy/testing/plugin/pytestplugin.py
@@ -74,6 +74,9 @@ 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)]
     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/setup.cfg b/setup.cfg
index 7517220a66..698c4b037f 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -9,7 +9,7 @@ first-package-wins = true
 where = test
 
 [pytest]
-addopts= --tb native -v -r fxX
+addopts= --tb native -v -r fxX --maxfail=25
 python_files=test/*test_*.py
 
 [upload]