From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sat, 11 Oct 2014 22:35:12 +0000 (-0400)
Subject: - embedding an existing predicate into a new one only
X-Git-Tag: rel_1_0_0b1~70^2~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=83e465633793e4a6d76e41b12fb92d7cc4bbddf3;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- 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
---

diff --git a/lib/sqlalchemy/testing/exclusions.py b/lib/sqlalchemy/testing/exclusions.py
index 49211f8051..f94724608a 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