summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2014-10-11 18:35:12 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2014-10-11 18:35:12 -0400
commit83e465633793e4a6d76e41b12fb92d7cc4bbddf3 (patch)
treed2e99d3980d4634a08fd144c842f6a585716e3f0 /lib/sqlalchemy
parentcc29c4afff20dd251dbc045a490da9942f98b1bf (diff)
downloadsqlalchemy-83e465633793e4a6d76e41b12fb92d7cc4bbddf3.tar.gz
- embedding an existing predicate into a new one only
seems to be used by test_oracle->test_coerce_to_unicode(). The predicate here should treat as a lambda based on enabled_for_config. not sure why this test is not failing on jenkins
Diffstat (limited to 'lib/sqlalchemy')
-rw-r--r--lib/sqlalchemy/testing/exclusions.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/sqlalchemy/testing/exclusions.py b/lib/sqlalchemy/testing/exclusions.py
index 49211f805..f94724608 100644
--- a/lib/sqlalchemy/testing/exclusions.py
+++ b/lib/sqlalchemy/testing/exclusions.py
@@ -178,8 +178,7 @@ class Predicate(object):
@classmethod
def as_predicate(cls, predicate, description=None):
if isinstance(predicate, compound):
- return cls.as_predicate(predicate.fails.union(predicate.skips))
-
+ return cls.as_predicate(predicate.enabled_for_config, description)
elif isinstance(predicate, Predicate):
if description and predicate.description is None:
predicate.description = description