From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Tue, 11 Mar 2014 22:06:20 +0000 (-0400)
Subject: unitttest has a SkipTest also but pytest doesn't
X-Git-Tag: rel_0_9_4~67
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=66338e33bfeab571340b86e321b4237b20456a0f;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

unitttest has a SkipTest also but pytest doesn't
honor it unless nose is imported too...
---

diff --git a/lib/sqlalchemy/testing/plugin/plugin_base.py b/lib/sqlalchemy/testing/plugin/plugin_base.py
index 6a2814109e..8bdb7b0788 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