From 5e856ed3cbaa741e27b178e970cf39f928ee0dfc Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Mon, 15 Sep 2014 14:53:20 -0400 Subject: [PATCH] - fix issue where nose Failure object comes into play here Conflicts: lib/sqlalchemy/testing/plugin/noseplugin.py --- lib/sqlalchemy/testing/plugin/noseplugin.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/sqlalchemy/testing/plugin/noseplugin.py b/lib/sqlalchemy/testing/plugin/noseplugin.py index e362d61417..14955b3ae1 100644 --- a/lib/sqlalchemy/testing/plugin/noseplugin.py +++ b/lib/sqlalchemy/testing/plugin/noseplugin.py @@ -58,7 +58,7 @@ class NoseSQLAlchemy(Plugin): plugin_base.set_coverage_flag(options.enable_plugin_coverage) global fixtures - from sqlalchemy.testing import fixtures + from sqlalchemy.testing import fixtures # noqa def begin(self): plugin_base.post_begin() @@ -76,9 +76,12 @@ class NoseSQLAlchemy(Plugin): return plugin_base.want_class(cls) def beforeTest(self, test): - plugin_base.before_test(test, - test.test.cls.__module__, - test.test.cls, test.test.method.__name__) + if not hasattr(test.test, 'cls'): + return + plugin_base.before_test( + test, + test.test.cls.__module__, + test.test.cls, test.test.method.__name__) def afterTest(self, test): plugin_base.after_test(test) -- 2.47.3