summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/testing
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2014-01-02 14:23:14 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2014-01-02 14:23:14 -0500
commit4b923d37bdfdb44d9a3e74aed08e2726e14c3b19 (patch)
treeb0abe04a3bf3804edc20bdaeb0bbec32fc522336 /lib/sqlalchemy/testing
parentf00657fa8a3a484d3a9207c67c0a1d20ab8313bb (diff)
downloadsqlalchemy-4b923d37bdfdb44d9a3e74aed08e2726e14c3b19.tar.gz
- support addition of fails_if()/only_on(), just wraps the decorators
- update a few exclusions to support current pymssql. passes all of test_suite and dialect/mssql
Diffstat (limited to 'lib/sqlalchemy/testing')
-rw-r--r--lib/sqlalchemy/testing/exclusions.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/sqlalchemy/testing/exclusions.py b/lib/sqlalchemy/testing/exclusions.py
index 9f14ee105..611e9de6c 100644
--- a/lib/sqlalchemy/testing/exclusions.py
+++ b/lib/sqlalchemy/testing/exclusions.py
@@ -24,6 +24,11 @@ class skip_if(object):
def enabled(self):
return not self.predicate()
+ def __add__(self, other):
+ def decorate(fn):
+ return other(self(fn))
+ return decorate
+
@contextlib.contextmanager
def fail_if(self, name='block'):
try: