Changeset 4539

Timestamp:

04/29/08 02:18:00 (3 months ago)

Author:

alberto

Message:

nosetest integration half-done (broken)

Files:

• projects/ToscaWidgets/branches/nosetests-integration/setup.cfg (modified) (2 diffs)
• projects/ToscaWidgets/branches/nosetests-integration/setup.py (modified) (2 diffs)
• projects/ToscaWidgets/branches/nosetests-integration/tests/__init__.py (modified) (1 diff)
• projects/ToscaWidgets/branches/nosetests-integration/tests/test_wsgiapps.py (modified) (1 diff)
• projects/ToscaWidgets/branches/nosetests-integration/tw/core/__init__.py (modified) (1 diff)
• projects/ToscaWidgets/branches/nosetests-integration/tw/core/testutil.py (modified) (3 diffs)
• projects/ToscaWidgets/branches/nosetests-integration/tw/core/util.py (modified) (1 diff)

projects/ToscaWidgets/branches/nosetests-integration/setup.cfg

@@ -1 +1 @@
-[aliases]
-release = egg_info -RDb "" sdist bdist_egg register upload
+test = nosetests
-
-[egg_info]
@@ -16 +17 @@
-docformat = reStructuredText
-trac_browser_url = /trac/tw/browser
+
+[nosetests]
+verbosity = 2
+with-coverage = false
+cover-package = tw
+with-toscawidgets = true
+exclude-file = tw/mods/tg.py
+               tw/mods/pylonshf.py
+               tw/core/mako_util.py
+with-doctest = true
+doctest-extension = txt

projects/ToscaWidgets/branches/nosetests-integration/setup.py

@@ -74 +74 @@
-    author_email=__EMAIL__,
-    license=__LICENSE__,
-    test_suite = 'tests',
-    packages = PACKAGES,
-    namespace_packages = ['tw', 'tw.mods'],
@@ -100 +99 @@
-    [paste.filter_app_factory]
-    middleware = tw.api:make_middleware
+
+    [nose.plugins]
+    toscawidgets = tw.testutil:TWNosePlugin
-    """,
-    zip_safe=False,

projects/ToscaWidgets/branches/nosetests-integration/tests/__init__.py

@@ -1 @@
-import os
-import pkg_resources
-
-import tw.api
-from tw.core.testutil import get_doctest_suite
-
-dist_base = pkg_resources.get_distribution('ToscaWidgets').location
-
-DOCTEST_FILES = [
-    os.path.join(dist_base, 'docs', '*.txt'),
-    os.path.join(dist_base, 'tests', 'test_*.txt'),
-    os.path.join(dist_base, 'README.txt'),
-    ]
-
-DOCTEST_MODULES = [
-    "tw.core.base",
-    "tw.core.meta",
-    "tw.core.util",
-    "tw.core.resources",
-    "tw.core.genericfunctions",
-    "tw.core.view",
-    "tw.core.js",
-    ]
-
-def additional_tests():
-    return get_doctest_suite(DOCTEST_FILES, DOCTEST_MODULES)

projects/ToscaWidgets/branches/nosetests-integration/tests/test_wsgiapps.py

@@ -7 +7 @@
-from tw.core.testutil import RequireMixin
-
-
-
+
+
+
-sys.path.insert(0, examples_dir)
-

projects/ToscaWidgets/branches/nosetests-integration/tw/core/__init__.py

@@ +1 @@
+from pkg_resources import require
+require('ToscaWidgets')
+del require
+
-from exceptions import *
-from meta import *

projects/ToscaWidgets/branches/nosetests-integration/tw/core/testutil.py

@@ +1 @@
+import os
-import sys
-import doctest
-
-from new import instancemethod
-from glob import glob
-from unittest import TestCase
-from itertools import imap, chain
-from tw.core.util import install_framework
-
-import pkg_resources
+from nose.plugins import Plugin
+
-
-__all__ = [
@@ -42 +43 @@
-    widget_kw = {}
-    def setUp(self):
-        install_framework(force=True)
-        if hasattr(self, 'TestWidget'):
-            self.widget = self.TestWidget('test', **self.widget_kw)
@@ -132 +132 @@
-            pass # Mod has probably no doctests... ignore it
-    return suite
+
+class TWNosePlugin(Plugin):
+    """Makes sure a dummy tw.framework is installed before any test is run"""
+    
+    name = 'toscawidgets'
+    enabled = False
+    score = 1000
+
+    def add_options(self, parser, env=os.environ):
+        super(TWNosePlugin, self).add_options(parser, env)
+        parser.add_option('--exclude-file', 
+                          dest='exclude',
+                          action = 'append',
+                          default=[],
+                          help="Do not try to import this file")
+        
+    def configure(self, options, conf):
+        super(TWNosePlugin, self).configure(options, conf)
+        self.exclude = set(*(chain(op.split() for op in options.exclude)))
+
+    def begin(self):
+        if self.enabled:
+            from tw.core.util import install_framework
+            install_framework(True)
+
+    def wantFile(self, file):
+        relpath = file.replace(os.getcwd(), '').lstrip('/')
+        return  relpath.endswith('.py') and relpath not in self.exclude

projects/ToscaWidgets/branches/nosetests-integration/tw/core/util.py

@@ -260 +260 @@
-def install_framework(force=False):
-    import tw
+    assert False, tw.__file__
-    if not hasattr(tw, 'framework') or force:
-        from paste.registry import StackedObjectProxy, Registry