提交: 047b5d1abd2d9d561085d9d4d14952978115561b - allura (git)

allura

Commit MetaInfo

• 修訂: 047b5d1abd2d9d561085d9d4d14952978115561b (tree)
• 時間: 2011-04-30 02:08:35
• 作者: Rick Copeland <rcopeland@geek...>
• Commiter: Rick Copeland

Log Message

[#1831] Still fixing tests

Signed-off-by: Rick Copeland <[e-mail]>

Change Summary

• delete: Allura/allura/lib/patches.py
• modified: Allura/tg/__init__.py
• modified: Allura/tg/shim.py
• add: Allura/tg/traversal.py
• modified: AlluraTesting/alluratest/test_syntax.py
• modified: ForgeBlog/forgeblog/tests/functional/test_root.py
• modified: ForgeBlog/forgeblog/tests/test_roles.py
• modified: ForgeDiscussion/forgediscussion/tests/functional/test_forum.py
• modified: ForgeDiscussion/forgediscussion/tests/test_forum_roles.py
• modified: ForgeGit/forgegit/tests/functional/test_controllers.py
• modified: ForgeGit/forgegit/tests/test_git_app.py
• modified: ForgeHg/forgehg/tests/functional/test_controllers.py
• modified: ForgeHg/forgehg/tests/test_hg_app.py
• modified: ForgeHg/forgehg/tests/test_tasks.py
• modified: ForgeLink/forgelink/link_main.py
• modified: ForgeSVN/forgesvn/tests/functional/test_controllers.py
• modified: ForgeSVN/forgesvn/tests/model/test_repository.py
• modified: ForgeSVN/forgesvn/tests/test_svn_app.py
• modified: ForgeTracker/forgetracker/tests/functional/test_rest.py
• modified: ForgeTracker/forgetracker/tests/test_tracker_roles.py
• modified: ForgeTracker/forgetracker/tests/unit/__init__.py
• modified: ForgeTracker/forgetracker/tests/unit/test_globals_model.py
• modified: ForgeTracker/forgetracker/tests/unit/test_root_controller.py
• modified: ForgeTracker/forgetracker/tests/unit/test_ticket_custom_fields_form.py
• modified: ForgeTracker/forgetracker/tests/unit/test_ticket_form.py

差異

--- a/Allura/allura/lib/patches.py
+++ /dev/null
@@ -1,40 +0,0 @@
-import webob
-import tg.decorators
-from pylons import request
-
-from allura.lib import helpers as h
-
-def apply():
-    old_lookup_template_engine = tg.decorators.Decoration.lookup_template_engine
-
-    @h.monkeypatch(tg.decorators.Decoration)
-    def lookup_template_engine(self, request):
-        '''Wrapper to handle totally borked-up HTTP-ACCEPT headers'''
-        try:
-            return old_lookup_template_engine(self, request)
-        except:
-            pass
-        environ = dict(request.environ, HTTP_ACCEPT='*/*')
-        request = webob.Request(environ)
-        return old_lookup_template_engine(self, request)
-
-    @h.monkeypatch(tg, tg.decorators)
-    def override_template(controller, template):
-        '''Copy-pasted patch to allow multiple colons in a template spec'''
-        if hasattr(controller, 'decoration'):
-            decoration = controller.decoration
-        else:
-            return
-        if hasattr(decoration, 'engines'):
-            engines = decoration.engines
-        else:
-            return
-
-        for content_type, content_engine in engines.iteritems():
-            template = template.split(':', 1)
-            template.extend(content_engine[2:])
-            try:
-                override_mapping = request._override_mapping
-            except AttributeError:
-                override_mapping = request._override_mapping = {}
-            override_mapping[controller.im_func] = {content_type: template}

--- a/Allura/tg/__init__.py
+++ b/Allura/tg/__init__.py
@@ -1,3 +1,3 @@
-from shim import *
-from tg_globals import c, g, response, request, config, session, environ
-from decorators import expose, validate
+from .tg_globals import c, g, response, request, config, session, environ
+from .shim import redirect, url
+from .decorators import expose, validate

--- a/Allura/tg/shim.py
+++ b/Allura/tg/shim.py
@@ -6,12 +6,13 @@ import urllib
 import tg
 import pkg_resources
 import pyramid.response
-from webob import exc
 from formencode import Invalid
+from webob import exc
 
 from decorators import Decoration
 
 from . import tg_globals
+from .traversal import Resource
 
 __all__ = [ 'redirect', 'url' ]
 
@@ -42,33 +43,6 @@ class RootFactory(object):
             if hasattr(root_obj, '_cleanup_request'):
                 root_obj._cleanup_request()
 
-class Resource(object):
-
-    def __init__(self, controller):
-        self._controller = controller
-        sec = getattr(controller, '_check_security', lambda:None)
-        sec()
-
-    def __getitem__(self, name):
-        name = name.encode('utf-8')
-        try:
-            remainder = []
-            next = getattr(self._controller, name, None)
-            if next is None:
-                next, remainder = self._controller._lookup(name)
-            assert not remainder, 'Weird _lookup not supported'
-            return Resource(next)
-        except exc.HTTPNotFound:
-            return None
-
-    def get_deco(self):
-        func = self._controller
-        deco = Decoration.get(func, False)
-        if deco is None:
-            func = getattr(func, 'index', None)
-            deco = Decoration.get(func, False)
-        return deco, func
-
 def tg_view(context, request):
     deco, func = context.get_deco()
     try:

--- /dev/null
+++ b/Allura/tg/traversal.py
@@ -0,0 +1,46 @@
+'''Code to support pylons-style traversal on top of TG-style _lookup'''
+from decorators import Decoration
+
+class Resource(object):
+
+    def __init__(self, controller):
+        self._controller = controller
+        sec = getattr(controller, '_check_security', lambda:None)
+        sec()
+
+    def __getitem__(self, name):
+        name = name.encode('utf-8')
+        remainder = []
+        next = getattr(self._controller, name, None)
+        if next is None:
+            try:
+                next, remainder = self._controller._lookup(name)
+            except TypeError, te:
+                if 'takes at least' not in te.args[0]: raise
+                return CurriedResource(self._controller, [name])
+        assert not remainder, 'Weird _lookup not supported'
+        return Resource(next)
+
+    def get_deco(self):
+        func = self._controller
+        deco = Decoration.get(func, False)
+        if deco is None:
+            func = getattr(func, 'index', None)
+            deco = Decoration.get(func, False)
+        return deco, func
+
+class CurriedResource(object):
+
+    def __init__(self, controller, path):
+        self._controller = controller
+        self._path = path
+
+    def __getitem__(self, name):
+        new_path = self._path + [name]
+        try:
+            next, remainder = self._controller._lookup(*new_path)
+            assert not remainder, 'Weird _lookup not supported'
+            return Resource(next)
+        except TypeError, te:
+            if 'takes at least' not in te.args[0]: raise
+            return CurriedResource(self._controller, new_path)

--- a/AlluraTesting/alluratest/test_syntax.py
+++ b/AlluraTesting/alluratest/test_syntax.py
@@ -50,6 +50,8 @@ def test_pyflakes():
 
     if error:
         raise Exception('pyflakes failure, see stdout')
+    if run(find_py + " | grep -v '/migrations/' | xargs pyflakes | grep -v '" + "' | grep -v '".join(skips) + "'") != 1:
+        raise Exception('pyflakes failure')
 
 def test_no_now():
     if run(find_py + " | xargs grep '\.now(' ") not in [1,123]:

--- a/ForgeBlog/forgeblog/tests/functional/test_root.py
+++ b/ForgeBlog/forgeblog/tests/functional/test_root.py
@@ -56,8 +56,8 @@ class TestRootController(TestController):
         # two revisions are shown
         assert '2 by Test Admin' in response
         assert '1 by Test Admin' in response
-        self.app.get('/blog/2010/08/my-post?version=1')
-        self.app.get('/blog/2010/08/my-post?version=foo', status=404)
+        self.app.get('/blog/2010/08/my-post/?version=1')
+        self.app.get('/blog/2010/08/my-post/?version=foo', status=404)
 
     def test_post_diff(self):
         self._post()

--- a/ForgeBlog/forgeblog/tests/test_roles.py
+++ b/ForgeBlog/forgeblog/tests/test_roles.py
@@ -1,4 +1,4 @@
-from pylons import c, g
+from tg import c, g
 
 from alluratest.controller import setup_basic_test, setup_global_objects
 from allura import model as M

--- a/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py
+++ b/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py
@@ -6,7 +6,7 @@ from email.mime.image import MIMEImage
 from email.mime.multipart import MIMEMultipart
 
 import pkg_resources
-from pylons import g, c
+from tg import c
 from nose.tools import assert_equal
 
 from allura import model as M

--- a/ForgeDiscussion/forgediscussion/tests/test_forum_roles.py
+++ b/ForgeDiscussion/forgediscussion/tests/test_forum_roles.py
@@ -1,4 +1,4 @@
-from pylons import c, g
+from tg import c, g
 
 from alluratest.controller import setup_basic_test, setup_global_objects
 from allura import model as M

--- a/ForgeGit/forgegit/tests/functional/test_controllers.py
+++ b/ForgeGit/forgegit/tests/functional/test_controllers.py
@@ -1,6 +1,6 @@
 import tg
 import pkg_resources
-from pylons import c
+from tg import c
 from ming.orm import ThreadLocalORMSession
 
 from allura import model as M

--- a/ForgeGit/forgegit/tests/test_git_app.py
+++ b/ForgeGit/forgegit/tests/test_git_app.py
@@ -1,7 +1,7 @@
 import unittest
 from nose.tools import assert_equals
 
-from pylons import c, g
+from tg import c
 from ming.orm import ThreadLocalORMSession
 
 from alluratest.controller import setup_basic_test, setup_global_objects

--- a/ForgeHg/forgehg/tests/functional/test_controllers.py
+++ b/ForgeHg/forgehg/tests/functional/test_controllers.py
@@ -1,7 +1,5 @@
-import os
-
 import pkg_resources
-from pylons import c
+from tg import c
 from ming.orm import ThreadLocalORMSession
 
 from allura.lib import helpers as h

--- a/ForgeHg/forgehg/tests/test_hg_app.py
+++ b/ForgeHg/forgehg/tests/test_hg_app.py
@@ -1,7 +1,7 @@
 import unittest
 from nose.tools import assert_equals
 
-from pylons import c
+from tg import c
 from ming.orm import ThreadLocalORMSession
 
 from alluratest.controller import setup_basic_test, setup_global_objects

--- a/ForgeHg/forgehg/tests/test_tasks.py
+++ b/ForgeHg/forgehg/tests/test_tasks.py
@@ -1,7 +1,5 @@
 import unittest
 
-from pylons import c, g
-
 from ming.orm import ThreadLocalORMSession
 
 from alluratest.controller import setup_basic_test, setup_global_objects

--- a/ForgeLink/forgelink/link_main.py
+++ b/ForgeLink/forgelink/link_main.py
@@ -2,7 +2,8 @@
 import logging
 
 # Non-stdlib imports
-from tg import c, session, expose, redirect
+from tg import expose, redirect
+from tg import c, session
 
 # Pyforge-specific imports
 from allura.app import Application, ConfigOption, SitemapEntry, DefaultAdminController

--- a/ForgeSVN/forgesvn/tests/functional/test_controllers.py
+++ b/ForgeSVN/forgesvn/tests/functional/test_controllers.py
@@ -1,7 +1,5 @@
-import os
-
 import pkg_resources
-from pylons import c
+from tg import c
 from ming.orm import ThreadLocalORMSession
 
 from allura.lib import helpers as h

--- a/ForgeSVN/forgesvn/tests/model/test_repository.py
+++ b/ForgeSVN/forgesvn/tests/model/test_repository.py
@@ -3,8 +3,6 @@ import shutil
 import unittest
 import pkg_resources
 
-from pylons import c
-
 from ming.orm import ThreadLocalORMSession
 
 from alluratest.controller import setup_basic_test, setup_global_objects

--- a/ForgeSVN/forgesvn/tests/test_svn_app.py
+++ b/ForgeSVN/forgesvn/tests/test_svn_app.py
@@ -1,15 +1,11 @@
-import os
-import shutil
 import unittest
-import pkg_resources
 from nose.tools import assert_equals
 
-from pylons import c, g
+from tg import c
 from ming.orm import ThreadLocalORMSession
 
 from alluratest.controller import setup_basic_test, setup_global_objects
 from allura.lib import helpers as h
-from forgesvn import model as SM
 
 
 class TestSVNApp(unittest.TestCase):

--- a/ForgeTracker/forgetracker/tests/functional/test_rest.py
+++ b/ForgeTracker/forgetracker/tests/functional/test_rest.py
@@ -1,11 +1,7 @@
-from pylons import c
-from ming.orm import session
+from tg import c
 
-from allura import model as M
 from allura.lib import helpers as h
-from alluratest.controller import TestController, TestRestApiBase
-from forgetracker import model as TM
-
+from alluratest.controller import TestRestApiBase
 
 class TestTrackerApiBase(TestRestApiBase):
 

--- a/ForgeTracker/forgetracker/tests/test_tracker_roles.py
+++ b/ForgeTracker/forgetracker/tests/test_tracker_roles.py
@@ -1,4 +1,4 @@
-from pylons import c, g
+from tg import c, g
 
 from alluratest.controller import setup_basic_test, setup_global_objects
 from allura import model as M

--- a/ForgeTracker/forgetracker/tests/unit/__init__.py
+++ b/ForgeTracker/forgetracker/tests/unit/__init__.py
@@ -1,4 +1,4 @@
-from pylons import c
+from tg import c
 from ming.orm.ormsession import ThreadLocalORMSession
 
 from allura.websetup import bootstrap

--- a/ForgeTracker/forgetracker/tests/unit/test_globals_model.py
+++ b/ForgeTracker/forgetracker/tests/unit/test_globals_model.py
@@ -1,6 +1,6 @@
 from forgetracker.model import Globals
 from forgetracker.tests.unit import TrackerTestWithModel
-from pylons import c
+from tg import c
 from allura.lib import helpers as h
 
 from ming.orm.ormsession import ThreadLocalORMSession

--- a/ForgeTracker/forgetracker/tests/unit/test_root_controller.py
+++ b/ForgeTracker/forgetracker/tests/unit/test_root_controller.py
@@ -3,7 +3,7 @@ from ming.orm.ormsession import session
 
 from allura.lib import helpers as h
 from allura.model import User
-from pylons import c
+from tg import c
 from forgetracker.tests.unit import TrackerTestWithModel
 from forgetracker.model import Ticket, Globals
 from forgetracker import tracker_main

--- a/ForgeTracker/forgetracker/tests/unit/test_ticket_custom_fields_form.py
+++ b/ForgeTracker/forgetracker/tests/unit/test_ticket_custom_fields_form.py
@@ -1,7 +1,7 @@
 from ming.orm.ormsession import ThreadLocalORMSession
 from ming.base import Object
 
-from pylons import c
+from tg import c
 
 from forgetracker.tests.unit import TrackerTestWithModel
 from forgetracker.widgets import ticket_form

--- a/ForgeTracker/forgetracker/tests/unit/test_ticket_form.py
+++ b/ForgeTracker/forgetracker/tests/unit/test_ticket_form.py
@@ -1,7 +1,7 @@
 from mock import patch
 from ming.orm.ormsession import ThreadLocalORMSession
 
-from pylons import c
+from tg import c
 
 from forgetracker.tests.unit import TrackerTestWithModel
 from forgetracker.widgets import ticket_form