]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commitdiff
- embedding an existing predicate into a new one only
authorMike Bayer <mike_mp@zzzcomputing.com>
Sat, 11 Oct 2014 22:35:12 +0000 (18:35 -0400)
committerMike Bayer <mike_mp@zzzcomputing.com>
Sat, 11 Oct 2014 22:35:12 +0000 (18:35 -0400)
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

lib/sqlalchemy/testing/exclusions.py

index 49211f8051e76a5394f6e1f22be971bafc605681..f94724608aeb1ce7454c1db8835ddfc81b6dfa0a 100644 (file)
@@ -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