summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2014-08-16 13:33:02 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2014-08-16 13:33:02 -0400
commit7fa595221400d168a7bb78551d45379290db195f (patch)
treeda4acef492c78ca9d0aebeb6394d4c6ea11c72c6
parentca69e4560333a1a7e3a2dafd746be851cc89228c (diff)
downloadsqlalchemy-7fa595221400d168a7bb78551d45379290db195f.tar.gz
- max failures 25
- guard against some potential pytest snarkiness
-rw-r--r--lib/sqlalchemy/testing/plugin/pytestplugin.py3
-rw-r--r--setup.cfg2
2 files changed, 4 insertions, 1 deletions
diff --git a/lib/sqlalchemy/testing/plugin/pytestplugin.py b/lib/sqlalchemy/testing/plugin/pytestplugin.py
index f4c9efd55..005942913 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 7517220a6..698c4b037 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]