From e9fc615a2107c2c1aaf29a0c3c6923549c4b7150 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Sat, 29 Sep 2012 13:34:03 -0400 Subject: [PATCH] adjustments --- lib/sqlalchemy/testing/exclusions.py | 2 +- lib/sqlalchemy/testing/plugin/noseplugin.py | 6 +++++- lib/sqlalchemy/testing/requirements.py | 9 ++++++++- test/requirements.py | 7 ------- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/lib/sqlalchemy/testing/exclusions.py b/lib/sqlalchemy/testing/exclusions.py index 96dd0d6934..07e3e7b7fa 100644 --- a/lib/sqlalchemy/testing/exclusions.py +++ b/lib/sqlalchemy/testing/exclusions.py @@ -86,7 +86,7 @@ class Predicate(object): class BooleanPredicate(Predicate): def __init__(self, value, description=None): self.value = value - self.description = description + self.description = description or "boolean %s" % value def __call__(self): return self.value diff --git a/lib/sqlalchemy/testing/plugin/noseplugin.py b/lib/sqlalchemy/testing/plugin/noseplugin.py index 60190eb8b2..aff1dffa5b 100644 --- a/lib/sqlalchemy/testing/plugin/noseplugin.py +++ b/lib/sqlalchemy/testing/plugin/noseplugin.py @@ -144,7 +144,11 @@ class NoseSQLAlchemy(Plugin): test_suite.__name__ = cls.__name__ for requirement in cls.__requires__: check = getattr(config.requirements, requirement) - check(test_suite)() + try: + check(test_suite)() + except TypeError: + import pdb + pdb.set_trace() if cls.__unsupported_on__: spec = exclusions.db_spec(*cls.__unsupported_on__) diff --git a/lib/sqlalchemy/testing/requirements.py b/lib/sqlalchemy/testing/requirements.py index 90385c391e..ea82424481 100644 --- a/lib/sqlalchemy/testing/requirements.py +++ b/lib/sqlalchemy/testing/requirements.py @@ -68,4 +68,11 @@ class SuiteRequirements(Requirements): def sequences(self): """Target database must support SEQUENCEs.""" - return self.config.db.dialect.supports_sequences + return exclusions.only_if([ + lambda: self.config.db.dialect.supports_sequences + ], "no SEQUENCE support") + + @property + def reflects_pk_names(self): + return exclusions.closed() + diff --git a/test/requirements.py b/test/requirements.py index e15c132416..eee3106d76 100644 --- a/test/requirements.py +++ b/test/requirements.py @@ -220,13 +220,6 @@ class DefaultRequirements(SuiteRequirements): "firebird" ], "no schema support") - @property - def sequences(self): - """Target database must support SEQUENCEs.""" - - return only_if([ - "postgresql", "firebird", "oracle" - ], "no SEQUENCE support") @property def update_nowait(self): -- 2.47.3