Merge lp:~jbaker/storm/nose_plugin into lp:storm

[Jason Baker]

[Jason Baker (jbaker)]

This branch adds a nose plugin to aid writing tests using storm. It allows users to turn the debug setting on by a command-line switch.

[Jürgen Gmach (jugmac00)]

Meanwhile Nose is unmaintained and obsolete as a Python test runner.

review: Disapprove

Unmerged revisions

353. By Jason Baker <jason@ubuntu> on 2009-12-01

Adding nose plugin.

=== modified file 'setup.py'
--- setup.py	2008-06-16 11:21:02 +0000
+++ setup.py	2009-12-01 19:05:23 +0000
@@ -4,8 +4,10 @@
 
 try:
     from setuptools import setup, Extension
+    use_setuptools = True
 except ImportError:
     from distutils.core import setup, Extension
+    use_setuptools = False
 
 
 if os.path.isfile("MANIFEST"):
@@ -28,6 +30,15 @@
             packages.append(directory.replace(os.sep, '.'))
     return packages
 
+if use_setuptools:
+    setuptools_kwargs = {
+        'entry_points' : {
+            'nose.plugins.0.10' : [
+                'storm_debug = storm.nose_plugin:StormDebug'],
+            }
+        }
+else:
+    setuptools_kwargs = {}
 
 setup(
     name="storm",
@@ -54,5 +65,6 @@
         "Topic :: Software Development :: Libraries :: Python Modules",
     ],
     ext_modules=(BUILD_CEXTENSIONS and
-                 [Extension("storm.cextensions", ["storm/cextensions.c"])])
+                 [Extension("storm.cextensions", ["storm/cextensions.c"])]),
+    **setuptools_kwargs
 )

=== added file 'storm/nose_plugin.py'
--- storm/nose_plugin.py	1970-01-01 00:00:00 +0000
+++ storm/nose_plugin.py	2009-12-01 19:05:23 +0000
@@ -0,0 +1,37 @@
+#
+# Copyright (c) 2006, 2007 Canonical
+#
+# Written by Gustavo Niemeyer <[e-mail]>
+#
+# This file is part of Storm Object Relational Mapper.
+#
+# Storm is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of
+# the License, or (at your option) any later version.
+#
+# Storm is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+"""
+This module contains a plugin to support enabling sql debugging.
+"""
+
+import sys
+from nose.plugins.base import Plugin
+from storm.tracer import debug
+
+class StormDebug(Plugin):
+    """
+    Enable outputting storm debug info.
+    """
+    def begin(self):
+        if self.enabled:
+            debug(True, sys.stdout)
+        else:
+            debug(False, sys.stdout)