diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2014-03-02 14:13:42 -0500 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2014-03-02 14:13:42 -0500 |
| commit | e932c263d54bb86451e8e4c63e459388654c860b (patch) | |
| tree | f030571e40b4f378342ca6822778ed8f2067b2d0 | |
| parent | 908368b2bdc1397b0ab6cfad12d6532e9c4ebd4e (diff) | |
| download | sqlalchemy-e932c263d54bb86451e8e4c63e459388654c860b.tar.gz | |
- get everything working again test-wise...
| -rw-r--r-- | lib/sqlalchemy/testing/exclusions.py | 8 | ||||
| -rw-r--r-- | lib/sqlalchemy/testing/schema.py | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/lib/sqlalchemy/testing/exclusions.py b/lib/sqlalchemy/testing/exclusions.py index 0f976e4e0..c517f9049 100644 --- a/lib/sqlalchemy/testing/exclusions.py +++ b/lib/sqlalchemy/testing/exclusions.py @@ -25,6 +25,10 @@ class skip_if(object): return other(self(fn)) return decorate + @property + def enabled(self): + return not self.predicate(config._current) + @contextlib.contextmanager def fail_if(self, name='block'): try: @@ -202,7 +206,7 @@ class LambdaPredicate(Predicate): def __init__(self, lambda_, description=None, args=None, kw=None): spec = inspect.getargspec(lambda_) if not spec[0]: - self.lambda_ = lambda db: lambda_ + self.lambda_ = lambda db: lambda_() else: self.lambda_ = lambda_ self.args = args or () @@ -313,7 +317,7 @@ def closed(): @decorator -def future(fn): +def future(fn, *arg): return fails_if(LambdaPredicate(fn), "Future feature") diff --git a/lib/sqlalchemy/testing/schema.py b/lib/sqlalchemy/testing/schema.py index ec0085219..605ca86b8 100644 --- a/lib/sqlalchemy/testing/schema.py +++ b/lib/sqlalchemy/testing/schema.py @@ -66,7 +66,7 @@ def Column(*args, **kw): test_opts = dict([(k, kw.pop(k)) for k in list(kw) if k.startswith('test_')]) - if not config.requirements.foreign_key_ddl.enabled: + if config.requirements.foreign_key_ddl.predicate(config): args = [arg for arg in args if not isinstance(arg, schema.ForeignKey)] col = schema.Column(*args, **kw) @@ -78,7 +78,7 @@ def Column(*args, **kw): # hardcoded rule for firebird, oracle; this should # be moved out - if exclusions.against('firebird', 'oracle'): + if exclusions.against(config, 'firebird', 'oracle'): def add_seq(c, tbl): c._init_items( schema.Sequence(_truncate_name( |