summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/testing/exclusions.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2014-03-06 11:57:54 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2014-03-06 11:57:54 -0500
commita4e84a154c51192c210cfe01088d0bf9da2eceda (patch)
tree011dbd5a0e54a376ffba5b1fe03eb993dad289e9 /lib/sqlalchemy/testing/exclusions.py
parent4175ca20508b0141c56560f4eae029c664213b79 (diff)
downloadsqlalchemy-a4e84a154c51192c210cfe01088d0bf9da2eceda.tar.gz
- cx_oracle test for "unicode returns" needs to be cx_oracle only,
and also will fail on py3k. - enhance exclusions so that a requirement attribute can be passed to fails_if/skip_if. - fix coverage docs to mention pytest.
Diffstat (limited to 'lib/sqlalchemy/testing/exclusions.py')
-rw-r--r--lib/sqlalchemy/testing/exclusions.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/testing/exclusions.py b/lib/sqlalchemy/testing/exclusions.py
index 9a713adaa..bcd593708 100644
--- a/lib/sqlalchemy/testing/exclusions.py
+++ b/lib/sqlalchemy/testing/exclusions.py
@@ -6,7 +6,7 @@
import operator
-from nose import SkipTest
+from .plugin.plugin_base import SkipTest
from ..util import decorator
from . import config
from .. import util
@@ -98,7 +98,7 @@ class Predicate(object):
@classmethod
def as_predicate(cls, predicate):
if isinstance(predicate, skip_if):
- return predicate.predicate
+ return NotPredicate(predicate.predicate)
elif isinstance(predicate, Predicate):
return predicate
elif isinstance(predicate, list):