diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2014-03-11 18:06:20 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2014-03-11 18:06:20 -0400 |
| commit | 66338e33bfeab571340b86e321b4237b20456a0f (patch) | |
| tree | f6134d28a4e7fb9d0aab7f19d3b8aa57132ef573 /lib/sqlalchemy/testing/plugin/plugin_base.py | |
| parent | 50f0d9be33d1d802c8642e9a338905f6ae396cb4 (diff) | |
| download | sqlalchemy-66338e33bfeab571340b86e321b4237b20456a0f.tar.gz | |
unitttest has a SkipTest also but pytest doesn't
honor it unless nose is imported too...
Diffstat (limited to 'lib/sqlalchemy/testing/plugin/plugin_base.py')
| -rw-r--r-- | lib/sqlalchemy/testing/plugin/plugin_base.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/lib/sqlalchemy/testing/plugin/plugin_base.py b/lib/sqlalchemy/testing/plugin/plugin_base.py index 6a2814109..8bdb7b078 100644 --- a/lib/sqlalchemy/testing/plugin/plugin_base.py +++ b/lib/sqlalchemy/testing/plugin/plugin_base.py @@ -14,13 +14,11 @@ via py.test. from __future__ import absolute_import try: - # needs 2.7... - from unittest import SkipTest + # unitttest has a SkipTest also but pytest doesn't + # honor it unless nose is imported too... + from nose import SkipTest except ImportError: - try: - from nose import SkipTest - except ImportError: - from _pytest.runner import Skipped as SkipTest + from _pytest.runner import Skipped as SkipTest import sys import re |