From 66338e33bfeab571340b86e321b4237b20456a0f Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Tue, 11 Mar 2014 18:06:20 -0400 Subject: unitttest has a SkipTest also but pytest doesn't honor it unless nose is imported too... --- lib/sqlalchemy/testing/plugin/plugin_base.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'lib/sqlalchemy/testing/plugin') 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 -- cgit v1.2.1