Commit: e5b93e1069d751591ce1dbd19b42cc6b1938a5f0 - allura (git)

allura

Commit MetaInfo

• Révision: e5b93e1069d751591ce1dbd19b42cc6b1938a5f0 (tree)
• l'heure: 2012-01-07 04:23:40
• Auteur: Tim Van Steenburgh <tvansteenburgh@geek...>
• Commiter: Tim Van Steenburgh

Message de Log

[#3417] Only install tools needed for tests.

Signed-off-by: Tim Van Steenburgh <[e-mail]>

Change Summary

• add: Allura/allura/tests/decorators.py
• modified: Allura/allura/tests/functional/test_admin.py
• modified: Allura/allura/tests/functional/test_auth.py
• modified: Allura/allura/tests/functional/test_feeds.py
• modified: Allura/allura/tests/functional/test_home.py
• modified: Allura/allura/tests/functional/test_neighborhood.py
• modified: Allura/allura/tests/functional/test_rest.py
• modified: Allura/allura/tests/functional/test_rest_api_tickets.py
• modified: Allura/allura/tests/functional/test_root.py
• modified: Allura/allura/tests/functional/test_user_profile.py
• modified: Allura/allura/tests/model/test_artifact.py
• modified: Allura/allura/tests/model/test_notification.py
• modified: Allura/allura/tests/model/test_project.py
• modified: Allura/allura/tests/test_globals.py
• modified: Allura/allura/tests/test_helpers.py
• modified: Allura/allura/tests/test_mail_util.py
• modified: Allura/allura/tests/test_security.py
• modified: Allura/allura/tests/test_tasks.py
• modified: Allura/allura/websetup/bootstrap.py
• modified: ForgeDiscussion/forgediscussion/tests/test_forum_roles.py
• modified: ForgeDownloads/forgedownloads/tests/functional/test_root.py
• modified: ForgeGit/forgegit/tests/functional/test_controllers.py
• modified: ForgeGit/forgegit/tests/model/test_repository.py
• modified: ForgeGit/forgegit/tests/test_git_app.py
• modified: ForgeGit/forgegit/tests/test_tasks.py
• modified: ForgeHg/forgehg/tests/functional/test_controllers.py
• modified: ForgeHg/forgehg/tests/model/test_repository.py
• modified: ForgeHg/forgehg/tests/test_hg_app.py
• modified: ForgeHg/forgehg/tests/test_tasks.py
• modified: ForgeLink/forgelink/tests/functional/test_root.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_import.py
• modified: ForgeTracker/forgetracker/tests/functional/test_rest.py
• modified: ForgeTracker/forgetracker/tests/functional/test_root.py
• modified: ForgeTracker/forgetracker/tests/test_controller.py
• modified: ForgeTracker/forgetracker/tests/test_tracker_roles.py
• modified: ForgeWiki/forgewiki/tests/functional/test_root.py
• modified: ForgeWiki/forgewiki/tests/test_wiki_roles.py

Modification

--- /dev/null
+++ b/Allura/allura/tests/decorators.py
@@ -0,0 +1,47 @@
+from functools import wraps
+
+from allura import model as M
+
+from ming.orm.ormsession import ThreadLocalORMSession
+
+from pylons import c
+
+
+def with_tool(project_shortname, ep_name, mount_point=None, mount_label=None,
+        ordinal=None, post_install_hook=None, **override_options):
+    def _with_tool(func):
+        @wraps(func)
+        def wrapped(*args, **kw):
+            c.user = M.User.by_username('test-admin')
+            p = M.Project.query.get(shortname=project_shortname)
+            c.project = p
+            if mount_point and not p.app_instance(mount_point):
+                c.app = p.install_app(ep_name, mount_point, mount_label, ordinal, **override_options)
+                if post_install_hook:
+                    post_install_hook(c.app)
+                while M.MonQTask.run_ready('setup'):
+                    pass
+                ThreadLocalORMSession.flush_all()
+                ThreadLocalORMSession.close_all()
+            elif mount_point:
+                c.app = p.app_instance(mount_point)
+            return func(*args, **kw)
+        return wrapped
+    return _with_tool
+
+with_discussion = with_tool('test', 'Discussion', 'discussion')
+with_link = with_tool('test', 'Link', 'link')
+with_tracker = with_tool('test', 'Tickets', 'bugs')
+with_wiki = with_tool('test', 'Wiki', 'wiki')
+with_git = with_tool('test', 'Git', 'src-git', 'Git', type='git')
+with_hg = with_tool('test', 'Hg', 'src-hg', 'Mercurial', type='hg')
+with_svn = with_tool('test', 'SVN', 'src', 'SVN')
+
+def with_repos(func):
+    @wraps(func)
+    @with_git
+    @with_hg
+    @with_svn
+    def wrapped(*args, **kw):
+        return func(*args, **kw)
+    return wrapped

--- a/Allura/allura/tests/functional/test_admin.py
+++ b/Allura/allura/tests/functional/test_admin.py
@@ -2,9 +2,7 @@ import os, allura
 import pkg_resources
 import Image, StringIO
 
-from nose.tools import assert_equals, assert_true
-from pylons import g, c
-
+from nose.tools import assert_equals
 from ming.orm.ormsession import ThreadLocalORMSession
 
 try:
@@ -13,9 +11,8 @@ except ImportError:
     sfx = None
 
 from allura.tests import TestController
+from allura.tests import decorators as td
 from allura import model as M
-from allura.lib import helpers as h
-
 
 class TestProjectAdmin(TestController):
 
@@ -443,6 +440,7 @@ class TestProjectAdmin(TestController):
         r = self.app.get('/admin/groups/')
         assert 'test-user' not in str(r), r.showbrowser()
 
+    @td.with_wiki
     def test_new_group(self):
         r = self.app.get('/admin/groups/new', validate_chunk=True)
         r = self.app.post('/admin/groups/create', params={'name': 'Developer'})

--- a/Allura/allura/tests/functional/test_auth.py
+++ b/Allura/allura/tests/functional/test_auth.py
@@ -3,8 +3,8 @@ import json
 from datadiff.tools import assert_equal
 
 from allura.tests import TestController
+from allura.tests import decorators as td
 from allura import model as M
-from allura.lib import helpers as h
 from ming.orm.ormsession import ThreadLocalORMSession
 
 
@@ -157,6 +157,7 @@ class TestAuth(TestController):
         # Make sure that default _lookup() throws 404
         self.app.get('/auth/foobar', status=404)
 
+    @td.with_svn
     def test_refresh_repo(self):
         r = self.app.get('/auth/refresh_repo')
         assert_equal(r.body, 'No repo specified')
@@ -185,22 +186,26 @@ class TestUserPermissions(TestController):
         r = self._check_repo('/git/test/bar')
         assert r == self.disallow, r
 
+    @td.with_svn
     def test_repo_write(self):
         r = self._check_repo('/git/test/src.git')
         assert r == self.allow, r
         r = self._check_repo('/git/test/src')
         assert r == self.allow, r
 
+    @td.with_svn
     def test_subdir(self):
         r = self._check_repo('/git/test/src.git/foo')
         assert r == self.allow, r
         r = self._check_repo('/git/test/src/foo')
         assert r == self.allow, r
 
+    @td.with_svn
     def test_neighborhood(self):
         r = self._check_repo('/git/test.p/src.git')
         assert r == self.allow, r
 
+    @td.with_svn
     def test_repo_read(self):
         r = self._check_repo(
             '/git/test.p/src.git',
@@ -223,6 +228,7 @@ class TestUserPermissions(TestController):
         except:
             return r
 
+    @td.with_repos
     def test_list_repos(self):
         r = self.app.get('/auth/repo_permissions', params=dict(username='test-admin'), status=200)
         assert_equal(json.loads(r.body), {"allow_write": [

--- a/Allura/allura/tests/functional/test_feeds.py
+++ b/Allura/allura/tests/functional/test_feeds.py
@@ -1,15 +1,16 @@
-from pylons import g
 from formencode.variabledecode import variable_encode
 
-from ming.orm.ormsession import ThreadLocalORMSession
-
 from allura.tests import TestController
-from allura import model as M
+from allura.tests import decorators as td
 
 class TestFeeds(TestController):
-
     def setUp(self):
         TestController.setUp(self)
+        self._setUp()
+
+    @td.with_wiki
+    @td.with_tracker
+    def _setUp(self):
         self.app.get('/wiki/')
         self.app.get('/bugs/')
         self.app.post(
@@ -39,10 +40,12 @@ class TestFeeds(TestController):
         self.app.get('/feed.rss')
         self.app.get('/feed.atom')
 
+    @td.with_wiki
     def test_wiki_feed(self):
         self.app.get('/wiki/feed.rss')
         self.app.get('/wiki/feed.atom')
 
+    @td.with_wiki
     def test_wiki_page_feed(self):
         self.app.post('/wiki/Root/update', params={
                 'title':'Root',
@@ -53,10 +56,12 @@ class TestFeeds(TestController):
         self.app.get('/wiki/Root/feed.rss')
         self.app.get('/wiki/Root/feed.atom')
 
+    @td.with_tracker
     def test_ticket_list_feed(self):
         self.app.get('/bugs/feed.rss')
         self.app.get('/bugs/feed.atom')
 
+    @td.with_tracker
     def test_ticket_feed(self):
         self.app.get('/bugs/1/feed.rss')
         r = self.app.get('/bugs/1/feed.atom')

--- a/Allura/allura/tests/functional/test_home.py
+++ b/Allura/allura/tests/functional/test_home.py
@@ -1,15 +1,13 @@
 import json
-from pylons import g
-from formencode.variabledecode import variable_encode
-
-from ming.orm.ormsession import ThreadLocalORMSession
 
 from allura.tests import TestController
+from allura.tests import decorators as td
 from allura import model as M
 
 
 class TestProjectHome(TestController):
 
+    @td.with_wiki
     def test_project_nav(self):
         response = self.app.get('/p/test/_nav.json')
         root = self.app.get('/p/test/wiki/').follow()
@@ -18,6 +16,7 @@ class TestProjectHome(TestController):
         for nl, entry in zip(nav_links, response.json['menu']):
             assert nl['href'] == entry['url']
 
+    @td.with_wiki
     def test_neighborhood_home(self):
         self.app.get('/p/test/wiki/', status=302)
         self.app.get('/adobe/test/wiki/', status=404)

--- a/Allura/allura/tests/functional/test_neighborhood.py
+++ b/Allura/allura/tests/functional/test_neighborhood.py
@@ -4,14 +4,11 @@ from cStringIO import StringIO
 
 import Image
 from tg import config
-from pylons import g, c
-
-from ming.orm.ormsession import ThreadLocalORMSession
 
 import allura
 from allura import model as M
 from allura.tests import TestController
-
+from allura.tests import decorators as td
 
 class TestNeighborhood(TestController):
 
@@ -330,6 +327,7 @@ class TestNeighborhood(TestController):
         r = self.app.get('/p/check_name?project_name=test')
         assert r.json['message'] == 'This project name is taken.'
 
+    @td.with_tool('test/sub1', 'Wiki', 'wiki')
     def test_neighborhood_project(self):
         self.app.get('/adobe/adobe-1/admin/', status=200)
         self.app.get('/p/test/sub1/wiki/')

--- a/Allura/allura/tests/functional/test_rest.py
+++ b/Allura/allura/tests/functional/test_rest.py
@@ -1,14 +1,7 @@
-from pprint import pprint
 from datetime import datetime, timedelta
-import json
-
-from pylons import c
-from ming.orm import session
-
-from allura import model as M
-from allura.lib import helpers as h
-from alluratest.controller import TestController, TestRestApiBase
 
+from allura.tests import decorators as td
+from alluratest.controller import TestRestApiBase
 
 class TestRestHome(TestRestApiBase):
 
@@ -36,11 +29,13 @@ class TestRestHome(TestRestApiBase):
         r = self.api_post('/rest/p/test/admin/')
         assert r.status_int == 404
 
+    @td.with_wiki
     def test_project_ping(self):
         r = self.api_get('/rest/p/test/wiki/Home/')
         assert r.status_int == 200
         assert r.json['title'] == 'Home', r.json
 
+    @td.with_tool('test/sub1', 'Wiki', 'wiki')
     def test_subproject_ping(self):
         r = self.api_get('/rest/p/test/sub1/wiki/Home/')
         assert r.status_int == 200

--- a/Allura/allura/tests/functional/test_rest_api_tickets.py
+++ b/Allura/allura/tests/functional/test_rest_api_tickets.py
@@ -1,13 +1,10 @@
-from pprint import pprint
 from datetime import datetime, timedelta
-import json
 
-from pylons import c
 from ming.orm import session
 
 from allura import model as M
-from allura.lib import helpers as h
-from alluratest.controller import TestController, TestRestApiBase
+from allura.tests import decorators as td
+from alluratest.controller import TestRestApiBase
 
 
 class TestApiTicket(TestRestApiBase):
@@ -49,6 +46,7 @@ class TestApiTicket(TestRestApiBase):
         r = self.api_post('/rest/p/test/admin/')
         assert r.status_int == 404
 
+    @td.with_wiki
     def test_project_ping(self):
         self.set_api_ticket()
         r = self.api_get('/rest/p/test/wiki/Home/')
@@ -60,6 +58,7 @@ class TestApiTicket(TestRestApiBase):
         r = self.api_post('/rest/p/test/wiki/')
         assert r.status_int == 403
 
+    @td.with_tool('test/sub1', 'Wiki', 'wiki')
     def test_subproject_ping(self):
         self.set_api_ticket()
         r = self.api_get('/rest/p/test/sub1/wiki/Home/')

--- a/Allura/allura/tests/functional/test_root.py
+++ b/Allura/allura/tests/functional/test_root.py
@@ -12,12 +12,11 @@ Please read http://pythonpaste.org/webtest/ for more information.
 """
 from urllib import quote
 
-from nose.tools import assert_true, assert_equal
+from nose.tools import assert_equal
 
+from allura.tests import decorators as td
 from allura.tests import TestController
 from allura import model as M
-from ming.orm import session
-
 
 class TestRootController(TestController):
 
@@ -89,6 +88,7 @@ class TestRootController(TestController):
         assert len(response.html.findAll('img',{'alt':'adobe-1 Logo'})) == 0
         assert len(response.html.findAll('img',{'alt':'adobe-2 Logo'})) == 1
 
+    @td.with_wiki
     def test_markdown_to_html(self):
         n = M.Neighborhood.query.get(name='Projects')
         r = self.app.get('/nf/markdown_to_html?markdown=*aaa*bb[wiki:Home]&project=test&app=bugs&neighborhood=%s' % n._id, validate_chunk=True)

--- a/Allura/allura/tests/functional/test_user_profile.py
+++ b/Allura/allura/tests/functional/test_user_profile.py
@@ -1,8 +1,8 @@
 from formencode.variabledecode import variable_encode
 
+from allura.tests import decorators as td
 from allura.tests import TestController
 
-
 class TestUserProfile(TestController):
 
     def test_profile(self):
@@ -28,6 +28,7 @@ class TestUserProfile(TestController):
         response = self.app.get('/u/test-user/profile/')
         assert 'Email Addresses' not in response
 
+    @td.with_wiki
     def test_feed(self):
         response = self.app.get('/u/test-admin/profile/feed')
         assert 'Recent posts by Test Admin' in response

--- a/Allura/allura/tests/model/test_artifact.py
+++ b/Allura/allura/tests/model/test_artifact.py
@@ -16,6 +16,7 @@ import allura
 from allura import model as M
 from allura.lib import helpers as h
 from allura.lib import security
+from allura.tests import decorators as td
 from allura.websetup.schema import REGISTRY
 from alluratest.controller import setup_basic_test, setup_unit_test
 from forgewiki import model as WM
@@ -34,6 +35,10 @@ Mapper.compile_all()
 def setUp():
     setup_basic_test()
     setup_unit_test()
+    setup_with_tools()
+
[e-mail]_wiki
+def setup_with_tools():
     h.set_context('test', 'wiki', neighborhood='Projects')
     Checkmessage.query.remove({})
     WM.Page.query.remove({})

--- a/Allura/allura/tests/model/test_notification.py
+++ b/Allura/allura/tests/model/test_notification.py
@@ -8,12 +8,17 @@ from ming.orm import ThreadLocalORMSession
 from alluratest.controller import setup_basic_test, setup_global_objects, REGISTRY
 from allura import model as M
 from allura.lib import helpers as h
+from allura.tests import decorators as td
 from forgewiki import model as WM
 
 class TestNotification(unittest.TestCase):
 
     def setUp(self):
         setup_basic_test()
+        self.setup_with_tools()
+
+    @td.with_wiki
+    def setup_with_tools(self):
         setup_global_objects()
         _clear_subscriptions()
         _clear_notifications()
@@ -46,6 +51,10 @@ class TestPostNotifications(unittest.TestCase):
 
     def setUp(self):
         setup_basic_test()
+        self.setup_with_tools()
+
+    @td.with_wiki
+    def setup_with_tools(self):
         setup_global_objects()
         g.set_app('wiki')
         _clear_subscriptions()
@@ -147,6 +156,10 @@ class TestSubscriptionTypes(unittest.TestCase):
 
     def setUp(self):
         setup_basic_test()
+        self.setup_with_tools()
+
+    @td.with_wiki
+    def setup_with_tools(self):
         setup_global_objects()
         g.set_app('wiki')
         _clear_subscriptions()

--- a/Allura/allura/tests/model/test_project.py
+++ b/Allura/allura/tests/model/test_project.py
@@ -2,22 +2,22 @@
 """
 Model tests for project
 """
-from datetime import datetime
-
-import mock
 from nose.tools import with_setup
-from pylons import c, g, request
-from webob import Request
+from pylons import c 
 from ming.orm.ormsession import ThreadLocalORMSession
 
 from allura import model as M
-from allura.lib.app_globals import Globals
 from allura.lib import helpers as h
+from allura.tests import decorators as td
 from alluratest.controller import setup_basic_test, setup_global_objects
 
 
 def setUp():
     setup_basic_test()
+    setup_with_tools()
+
[e-mail]_wiki
+def setup_with_tools():
     setup_global_objects()
 
 @with_setup(setUp)

--- a/Allura/allura/tests/test_globals.py
+++ b/Allura/allura/tests/test_globals.py
@@ -3,11 +3,12 @@ from urllib import quote
 from nose.tools import with_setup, assert_equal
 from pylons import g, c
 
-from ming.orm import session, ThreadLocalORMSession
+from ming.orm import ThreadLocalORMSession
 from alluratest.controller import setup_basic_test, setup_global_objects
 
 from allura import model as M
 from allura.lib import helpers as h
+from allura.tests import decorators as td
 
 from forgewiki import model as WM
 from forgeblog import model as BM
@@ -16,8 +17,13 @@ from forgeblog import model as BM
 def setUp():
     """Method called by nose before running each test"""
     setup_basic_test()
+    setup_with_tools()
+
[e-mail]_wiki
+def setup_with_tools():
     setup_global_objects()
 
[e-mail]_wiki
 def test_app_globals():
     g.oid_session()
     g.oid_session()

--- a/Allura/allura/tests/test_helpers.py
+++ b/Allura/allura/tests/test_helpers.py
@@ -1,14 +1,11 @@
-from os import path, environ
+from os import path
 
-from tg import config
-from pylons import c, g
-from paste.deploy import loadapp
-from paste.script.appinstall import SetupCommand
+from pylons import c
 from nose.tools import eq_, assert_equals
 
 from allura import model as M
 from allura.lib import helpers as h
-
+from allura.tests import decorators as td
 from alluratest.controller import setup_basic_test
 
 
@@ -51,6 +48,7 @@ def test_make_roles():
     pr = u.project_role()
     assert h.make_roles([pr._id]).next() == pr
 
[e-mail]_wiki
 def test_context_setters():
     h.set_context('test', 'wiki', neighborhood='Projects')
     assert c.project is not None

--- a/Allura/allura/tests/test_mail_util.py
+++ b/Allura/allura/tests/test_mail_util.py
@@ -2,10 +2,7 @@
 import unittest
 from email.MIMEMultipart import MIMEMultipart
 from email.MIMEText import MIMEText
-from email import header
-from email.parser import Parser
 
-import tg
 from nose.tools import raises, assert_equal
 from ming.orm import ThreadLocalORMSession
 
@@ -14,7 +11,7 @@ from allura.lib.utils import ConfigProxy
 
 from allura.lib.mail_util import parse_address, parse_message
 from allura.lib.exceptions import AddressException
-from allura.tasks.mail_tasks import route_email
+from allura.tests import decorators as td
 
 config = ConfigProxy(
     common_suffix='forgemail.domain',
@@ -44,6 +41,7 @@ class TestReactor(unittest.TestCase):
     def test_parse_address_bad_tool(self):
         parse_address('[e-mail].p' + config.common_suffix)
 
+    @td.with_wiki
     def test_parse_address_good(self):
         topic, project, app = parse_address('[e-mail].p' + config.common_suffix)
         assert_equal(topic, 'foo')

--- a/Allura/allura/tests/test_security.py
+++ b/Allura/allura/tests/test_security.py
@@ -1,21 +1,18 @@
-from unittest import TestCase
-from allura import model as M
-from allura.lib import plugin
-
+from allura.tests import decorators as td
 from allura.tests import TestController
 
-from alluratest.controller import setup_basic_test, setup_unit_test
-
 class TestSecurity(TestController):
 
     validate_skip = True
 
+    @td.with_wiki
     def test_anon(self):
         self.app.get('/security/*anonymous/forbidden', status=302)
         self.app.get('/security/*anonymous/needs_auth', status=302)
         self.app.get('/security/*anonymous/needs_project_access_fail', status=302)
         self.app.get('/security/*anonymous/needs_artifact_access_fail', status=302)
 
+    @td.with_wiki
     def test_auth(self):
         self.app.get('/security/test-admin/forbidden', status=403)
         self.app.get('/security/test-admin/needs_auth', status=200)

--- a/Allura/allura/tests/test_tasks.py
+++ b/Allura/allura/tests/test_tasks.py
@@ -17,6 +17,7 @@ from allura.tasks import index_tasks
 from allura.tasks import mail_tasks
 from allura.tasks import notification_tasks
 from allura.tasks import repo_tasks
+from allura.tests import decorators as td
 from allura.lib.decorators import event_handler, task
 
 class TestEventTasks(unittest.TestCase):
@@ -45,6 +46,7 @@ class TestIndexTasks(unittest.TestCase):
         setup_basic_test()
         setup_global_objects()
 
+    @td.with_wiki
     def test_add_artifacts(self):
         old_shortlinks = M.Shortlink.query.find().count()
         old_solr_size = len(g.solr.db)
@@ -65,6 +67,7 @@ class TestIndexTasks(unittest.TestCase):
         a = _TestArtifact.query.get(_shorthand_id='t3')
         assert len(a.backrefs) == 5, a.backrefs
 
+    @td.with_wiki
     def test_del_artifacts(self):
         old_shortlinks = M.Shortlink.query.find().count()
         old_solr_size = len(g.solr.db)
@@ -114,6 +117,7 @@ class TestMailTasks(unittest.TestCase):
             assert args[5] == None
             assert 'This is a test' in str(args[6]), str(args[6])
 
+    @td.with_wiki
     def test_receive_email_ok(self):
         c.user = M.User.by_username('test-admin')
         import forgewiki
@@ -143,7 +147,10 @@ class TestRepoTasks(unittest.TestCase):
 
     def setUp(self):
         setup_basic_test()
-        setup_global_objects()
+        self.setup_with_tools()
+
+    @td.with_svn
+    def setup_with_tools(self):
         h.set_context('test', 'src', neighborhood='Projects')
 
     def test_init(self):

--- a/Allura/allura/websetup/bootstrap.py
+++ b/Allura/allura/websetup/bootstrap.py
@@ -138,42 +138,23 @@ def bootstrap(command, conf, vars):
         # TODO: Hope that Ming can be improved to at least avoid stuff below
         sess.flush(x)
 
-
-    log.info('Registering initial apps')
-
     c.project = p0
     c.user = u_admin
     p1 = p0.new_subproject('sub1')
     ThreadLocalORMSession.flush_all()
     if asbool(conf.get('load_test_data')):
-        u_proj = M.Project.query.get(shortname='u/test-admin', neighborhood_id=n_users._id)
-        app = p0.install_app('SVN', 'src', 'SVN')
-        app = p0.install_app('Git', 'src-git', 'Git')
-        app.config.options['type'] = 'git'
-        app = p0.install_app('Hg', 'src-hg', 'Mercurial')
-        app.config.options['type'] = 'hg'
-        p0.install_app('Wiki', 'wiki')
-        p1.install_app('Wiki', 'wiki')
-        p0.install_app('Tickets', 'bugs')
-        app = p0.install_app('Tickets', 'doc-bugs')
-        role_anon = M.ProjectRole.by_name('*anonymous')._id
-        app.config.acl.append(M.ACE.allow(role_anon, 'post'))
-        app.config.acl.append(M.ACE.allow(role_anon, 'write'))
-        p0.install_app('Discussion', 'discussion')
-        p0.install_app('Link', 'link')
-        ThreadLocalORMSession.flush_all()
-        ThreadLocalORMSession.close_all()
         if asbool(conf.get('cache_test_data')):
             cache_test_data()
     else: # pragma no cover
         # regular first-time setup
         p0.add_user(u_admin, ['Admin'])
+        log.info('Registering initial apps')
         for ep_name, app in g.entry_points['tool'].iteritems():
             if not app.installable:
                 continue
             p0.install_app(ep_name)
-        ThreadLocalORMSession.flush_all()
-        ThreadLocalORMSession.close_all()
+    ThreadLocalORMSession.flush_all()
+    ThreadLocalORMSession.close_all()
 
 def wipe_database():
     conn = M.main_doc_session.bind.conn

--- a/ForgeDiscussion/forgediscussion/tests/test_forum_roles.py
+++ b/ForgeDiscussion/forgediscussion/tests/test_forum_roles.py
@@ -1,14 +1,15 @@
-from pylons import c, g
+from pylons import c
 
 from alluratest.controller import setup_basic_test, setup_global_objects
 from allura import model as M
 from allura.lib import security
+from allura.tests import decorators as td
 
 def setUp():
     setup_basic_test()
     setup_global_objects()
-    g.set_app('discussion')
 
[e-mail]_discussion
 def test_role_assignments():
     admin = M.User.by_username('test-admin')
     user = M.User.by_username('test-user')

--- a/ForgeDownloads/forgedownloads/tests/functional/test_root.py
+++ b/ForgeDownloads/forgedownloads/tests/functional/test_root.py
@@ -1,7 +1,8 @@
 from alluratest.controller import TestController
-
+from allura.tests import decorators as td
 
 class TestRootController(TestController):
+    @td.with_wiki
     def test_root(self):
         response = self.app.get('/downloads/nav.json')
         root = self.app.get('/p/test/wiki/').follow()

--- a/ForgeGit/forgegit/tests/functional/test_controllers.py
+++ b/ForgeGit/forgegit/tests/functional/test_controllers.py
@@ -11,12 +11,17 @@ from datadiff.tools import assert_equal
 
 from allura import model as M
 from allura.lib import helpers as h
+from allura.tests import decorators as td
 from alluratest.controller import TestController
 
 class TestRootController(TestController):
 
     def setUp(self):
         TestController.setUp(self)
+        self.setup_with_tools()
+
+    @td.with_git
+    def setup_with_tools(self):
         h.set_context('test', 'src-git', neighborhood='Projects')
         repo_dir = pkg_resources.resource_filename(
             'forgegit', 'tests/data')

--- a/ForgeGit/forgegit/tests/model/test_repository.py
+++ b/ForgeGit/forgegit/tests/model/test_repository.py
@@ -11,6 +11,7 @@ from ming.orm import ThreadLocalORMSession
 
 from alluratest.controller import setup_basic_test, setup_global_objects
 from allura.lib import helpers as h
+from allura.tests import decorators as td
 from allura import model as M
 from forgegit import model as GM
 from forgewiki import model as WM
@@ -19,6 +20,11 @@ class TestNewGit(unittest.TestCase):
 
     def setUp(self):
         setup_basic_test()
+        self.setup_with_tools()
+
+    @td.with_git
+    @td.with_wiki
+    def setup_with_tools(self):
         setup_global_objects()
         h.set_context('test', 'src-git', neighborhood='Projects')
         repo_dir = pkg_resources.resource_filename(
@@ -26,7 +32,7 @@ class TestNewGit(unittest.TestCase):
         c.app.repo.fs_path = repo_dir
         c.app.repo.name = 'testgit.git'
         self.repo = c.app.repo
-        # self.repo = GM.Repository(
+        #self.repo = GM.Repository(
         #     name='testgit.git',
         #     fs_path=repo_dir,
         #     url_path = '/test/',
@@ -88,6 +94,10 @@ class TestGitRepo(unittest.TestCase):
 
     def setUp(self):
         setup_basic_test()
+        self.setup_with_tools()
+
+    @td.with_git
+    def setup_with_tools(self):
         setup_global_objects()
         h.set_context('test', 'src-git', neighborhood='Projects')
         repo_dir = pkg_resources.resource_filename(
@@ -150,8 +160,12 @@ class TestGitCommit(unittest.TestCase):
 
     def setUp(self):
         setup_basic_test()
+        self.setup_with_tools()
+
+    @td.with_git
+    def setup_with_tools(self):
         setup_global_objects()
-        h.set_context('test', 'src', neighborhood='Projects')
+        h.set_context('test', 'src-git', neighborhood='Projects')
         repo_dir = pkg_resources.resource_filename(
             'forgegit', 'tests/data')
         self.repo = GM.Repository(

--- a/ForgeGit/forgegit/tests/test_git_app.py
+++ b/ForgeGit/forgegit/tests/test_git_app.py
@@ -1,17 +1,21 @@
 import unittest
 from nose.tools import assert_equals
 
-from pylons import c, g
+from pylons 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 allura.tests import decorators as td
 
 class TestGitApp(unittest.TestCase):
 
     def setUp(self):
         setup_basic_test()
+        self.setup_with_tools()
+
+    @td.with_git
+    def setup_with_tools(self):
         setup_global_objects()
         h.set_context('test', 'src-git', neighborhood='Projects')
         ThreadLocalORMSession.flush_all()
@@ -21,8 +25,9 @@ class TestGitApp(unittest.TestCase):
         assert_equals(len(c.app.admin_menu()), 4)
 
     def test_uninstall(self):
-        c.app.uninstall(c.project)
         from allura import model as M
+        M.MonQTask.run_ready()
+        c.app.uninstall(c.project)
         M.main_orm_session.flush()
         task = M.MonQTask.get()
         assert task.task_name == 'allura.tasks.repo_tasks.uninstall', task.task_name

--- a/ForgeGit/forgegit/tests/test_tasks.py
+++ b/ForgeGit/forgegit/tests/test_tasks.py
@@ -5,11 +5,16 @@ from ming.orm import ThreadLocalORMSession
 from alluratest.controller import setup_basic_test, setup_global_objects
 from allura.lib import helpers as h
 from allura.tasks import repo_tasks
+from allura.tests import decorators as td
 
 class TestGitTasks(unittest.TestCase):
 
     def setUp(self):
         setup_basic_test()
+        self.setup_with_tools()
+
+    @td.with_git
+    def setup_with_tools(self):
         setup_global_objects()
         h.set_context('test', 'src-git', neighborhood='Projects')
         ThreadLocalORMSession.flush_all()

--- a/ForgeHg/forgehg/tests/functional/test_controllers.py
+++ b/ForgeHg/forgehg/tests/functional/test_controllers.py
@@ -1,4 +1,3 @@
-import os
 import json
 
 import pkg_resources
@@ -7,6 +6,7 @@ from ming.orm import ThreadLocalORMSession
 from datadiff.tools import assert_equal
 
 from allura.lib import helpers as h
+from allura.tests import decorators as td
 from allura import model as M
 from alluratest.controller import TestController
 
@@ -15,6 +15,10 @@ class TestRootController(TestController):
 
     def setUp(self):
         TestController.setUp(self)
+        self.setup_with_tools()
+
+    @td.with_hg
+    def setup_with_tools(self):
         h.set_context('test', 'src-hg', neighborhood='Projects')
         repo_dir = pkg_resources.resource_filename(
             'forgehg', 'tests/data')

--- a/ForgeHg/forgehg/tests/model/test_repository.py
+++ b/ForgeHg/forgehg/tests/model/test_repository.py
@@ -7,6 +7,7 @@ from ming.orm import ThreadLocalORMSession
 
 from alluratest.controller import setup_basic_test, setup_global_objects
 from allura.lib import helpers as h
+from allura.tests import decorators as td
 from allura import model as M
 from forgehg import model as HM
 
@@ -14,8 +15,12 @@ class TestNewRepo(unittest.TestCase):
 
     def setUp(self):
         setup_basic_test()
+        self.setup_with_tools()
+
+    @td.with_hg
+    def setup_with_tools(self):
         setup_global_objects()
-        h.set_context('test', 'src', neighborhood='Projects')
+        h.set_context('test', 'src-hg', neighborhood='Projects')
         repo_dir = pkg_resources.resource_filename(
             'forgehg', 'tests/data')
         self.repo = HM.Repository(
@@ -50,7 +55,7 @@ class TestNewRepo(unittest.TestCase):
         assert self.rev.shorthand_id() == '[1c7eb5]'
         assert self.rev.symbolic_ids == (['default'], ['tip'])
         assert self.rev.url() == (
-            '/p/test/src/ci/'
+            '/p/test/src-hg/ci/'
             '1c7eb55bbd66ff45906b4a25d4b403899e0ffff1/')
         all_cis = self.rev.log(0, 1000)
         assert len(all_cis) == 5
@@ -65,7 +70,7 @@ class TestNewRepo(unittest.TestCase):
             'README', '<pre>This is readme\nAnother line\n</pre>')
         assert self.rev.tree.path() == '/'
         assert self.rev.tree.url() == (
-            '/p/test/src/ci/'
+            '/p/test/src-hg/ci/'
             '1c7eb55bbd66ff45906b4a25d4b403899e0ffff1/'
             'tree/')
         self.rev.tree.by_name['README']
@@ -75,6 +80,10 @@ class TestHgRepo(unittest.TestCase):
 
     def setUp(self):
         setup_basic_test()
+        self.setup_with_tools()
+
+    @td.with_hg
+    def setup_with_tools(self):
         setup_global_objects()
         h.set_context('test', 'src-hg', neighborhood='Projects')
         repo_dir = pkg_resources.resource_filename(
@@ -138,6 +147,10 @@ class TestHgCommit(unittest.TestCase):
 
     def setUp(self):
         setup_basic_test()
+        self.setup_with_tools()
+
+    @td.with_hg
+    def setup_with_tools(self):
         setup_global_objects()
         h.set_context('test', 'src-hg', neighborhood='Projects')
         repo_dir = pkg_resources.resource_filename(

--- a/ForgeHg/forgehg/tests/test_hg_app.py
+++ b/ForgeHg/forgehg/tests/test_hg_app.py
@@ -6,12 +6,16 @@ from ming.orm import ThreadLocalORMSession
 
 from alluratest.controller import setup_basic_test, setup_global_objects
 from allura.lib import helpers as h
-
+from allura.tests import decorators as td
 
 class TestHgApp(unittest.TestCase):
 
     def setUp(self):
         setup_basic_test()
+        self.setup_with_tools()
+
+    @td.with_hg
+    def setup_with_tools(self):
         setup_global_objects()
         h.set_context('test', 'src-hg', neighborhood='Projects')
         ThreadLocalORMSession.flush_all()
@@ -21,8 +25,9 @@ class TestHgApp(unittest.TestCase):
         assert_equals(len(c.app.admin_menu()), 4)
 
     def test_uninstall(self):
-        c.app.uninstall(c.project)
         from allura import model as M
+        M.MonQTask.run_ready()
+        c.app.uninstall(c.project)
         M.main_orm_session.flush()
         task = M.MonQTask.get()
         assert task.task_name == 'allura.tasks.repo_tasks.uninstall', task.task_name

--- a/ForgeHg/forgehg/tests/test_tasks.py
+++ b/ForgeHg/forgehg/tests/test_tasks.py
@@ -1,17 +1,20 @@
 import unittest
 
-from pylons import c, g
-
 from ming.orm import ThreadLocalORMSession
 
 from alluratest.controller import setup_basic_test, setup_global_objects
 from allura.lib import helpers as h
 from allura.tasks import repo_tasks
+from allura.tests import decorators as td
 
 class TestHgReactors(unittest.TestCase):
 
     def setUp(self):
         setup_basic_test()
+        self.setup_with_tools()
+
+    @td.with_hg
+    def setup_with_tools(self):
         setup_global_objects()
         h.set_context('test', 'src-hg', neighborhood='Projects')
         ThreadLocalORMSession.flush_all()

--- a/ForgeLink/forgelink/tests/functional/test_root.py
+++ b/ForgeLink/forgelink/tests/functional/test_root.py
@@ -1,9 +1,5 @@
-import allura
-
+from allura.tests import decorators as td
 from alluratest.controller import TestController
-from allura.lib import helpers as h
-from allura.ext.search import search_main
-from ming.orm.ormsession import ThreadLocalORMSession
 
 
 class TestRootController(TestController):
@@ -11,6 +7,7 @@ class TestRootController(TestController):
         response = self.app.get('/link/index')
         assert 'Link is not configured' in response
 
+    @td.with_link
     def test_root_index_with_url(self):
         response = self.app.get('/admin/link/options', validate_chunk=True)
         response.form['url'] = 'http://www.google.com/'

--- a/ForgeSVN/forgesvn/tests/functional/test_controllers.py
+++ b/ForgeSVN/forgesvn/tests/functional/test_controllers.py
@@ -1,4 +1,3 @@
-import os
 import json
 
 import pkg_resources
@@ -7,9 +6,9 @@ pylons.c = pylons.tmpl_context
 pylons.g = pylons.app_globals
 from pylons import c
 from ming.orm import ThreadLocalORMSession
-from datadiff.tools import assert_equal
 
 from allura.lib import helpers as h
+from allura.tests import decorators as td
 from alluratest.controller import TestController
 
 
@@ -17,6 +16,10 @@ class TestRootController(TestController):
 
     def setUp(self):
         TestController.setUp(self)
+        self.setup_with_tools()
+
+    @td.with_svn
+    def setup_with_tools(self):
         h.set_context('test', 'src', neighborhood='Projects')
         repo_dir = pkg_resources.resource_filename(
             'forgesvn', 'tests/data/')

--- a/ForgeSVN/forgesvn/tests/model/test_repository.py
+++ b/ForgeSVN/forgesvn/tests/model/test_repository.py
@@ -7,6 +7,7 @@ from ming.orm import ThreadLocalORMSession
 
 from alluratest.controller import setup_basic_test, setup_global_objects
 from allura.lib import helpers as h
+from allura.tests import decorators as td
 from allura import model as M
 from forgesvn import model as SM
 
@@ -14,6 +15,10 @@ class TestNewRepo(unittest.TestCase):
 
     def setUp(self):
         setup_basic_test()
+        self.setup_with_tools()
+
+    @td.with_svn
+    def setup_with_tools(self):
         setup_global_objects()
         h.set_context('test', 'src', neighborhood='Projects')
         repo_dir = pkg_resources.resource_filename(
@@ -64,7 +69,12 @@ class TestSVNRepo(unittest.TestCase):
 
     def setUp(self):
         setup_basic_test()
+        self.setup_with_tools()
+
+    @td.with_svn
+    def setup_with_tools(self):
         setup_global_objects()
+        h.set_context('test', 'src', neighborhood='Projects')
         repo_dir = pkg_resources.resource_filename(
             'forgesvn', 'tests/data/')
         self.repo = SM.Repository(
@@ -128,6 +138,10 @@ class TestSVNRev(unittest.TestCase):
 
     def setUp(self):
         setup_basic_test()
+        self.setup_with_tools()
+
+    @td.with_svn
+    def setup_with_tools(self):
         setup_global_objects()
         h.set_context('test', 'src', neighborhood='Projects')
         repo_dir = pkg_resources.resource_filename(
@@ -159,5 +173,3 @@ class TestSVNRev(unittest.TestCase):
                  +self.rev.diffs.copied)
         for d in diffs:
             print d
-
-

--- a/ForgeSVN/forgesvn/tests/test_svn_app.py
+++ b/ForgeSVN/forgesvn/tests/test_svn_app.py
@@ -1,21 +1,21 @@
-import os
-import shutil
 import unittest
-import pkg_resources
 from nose.tools import assert_equals
 
-from pylons import c, g
+from pylons 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
-
+from allura.tests import decorators as td
 
 class TestSVNApp(unittest.TestCase):
 
     def setUp(self):
         setup_basic_test()
+        self.setup_with_tools()
+
+    @td.with_svn
+    def setup_with_tools(self):
         setup_global_objects()
         h.set_context('test', 'src', neighborhood='Projects')
         ThreadLocalORMSession.flush_all()
@@ -26,8 +26,9 @@ class TestSVNApp(unittest.TestCase):
         assert_equals(c.app.admin_menu()[0].label, 'Checkout URL')
 
     def test_uninstall(self):
-        c.app.uninstall(c.project)
         from allura import model as M
+        M.MonQTask.run_ready()
+        c.app.uninstall(c.project)
         M.main_orm_session.flush()
         task = M.MonQTask.get()
         assert task.task_name == 'allura.tasks.repo_tasks.uninstall', task.task_name

--- a/ForgeTracker/forgetracker/tests/functional/test_import.py
+++ b/ForgeTracker/forgetracker/tests/functional/test_import.py
@@ -7,13 +7,13 @@ import ming
 import pylons
 pylons.c = pylons.tmpl_context
 pylons.g = pylons.app_globals
-from pylons import c, g
+from pylons import g
 
 from allura import model as M
-from alluratest.controller import TestController, TestRestApiBase
+from alluratest.controller import TestRestApiBase
+from allura.tests import decorators as td
 
-
-class TestImportController(TestRestApiBase):#TestController):
+class TestImportController(TestRestApiBase):
 
     def new_ticket(self, mount_point='/bugs/', **kw):
         response = self.app.get(mount_point + 'new/')
@@ -32,7 +32,7 @@ class TestImportController(TestRestApiBase):#TestController):
         ming.orm.session(api_ticket).flush()
         self.set_api_token(api_ticket)
 
-
+    @td.with_tracker
     def test_no_capability(self):
         here_dir = os.path.dirname(__file__)
 
@@ -66,6 +66,7 @@ class TestImportController(TestRestApiBase):#TestController):
         assert_equal(from_api['custom_fields']['_cc'], org['cc'])
         assert_equal(from_api['custom_fields']['_private'], org['private'])
 
+    @td.with_tracker
     def test_validate_import(self):
         here_dir = os.path.dirname(__file__)
         doc_text = open(here_dir + '/data/sf.json').read()
@@ -73,6 +74,7 @@ class TestImportController(TestRestApiBase):#TestController):
             doc=doc_text, options='{}')
         assert not r.json['errors']
 
+    @td.with_tracker
     def test_import(self):
         here_dir = os.path.dirname(__file__)
         api_ticket = M.ApiTicket(user_id=self.user._id, capabilities={'import': ['Projects','test']},

--- a/ForgeTracker/forgetracker/tests/functional/test_rest.py
+++ b/ForgeTracker/forgetracker/tests/functional/test_rest.py
@@ -2,18 +2,20 @@ import pylons
 pylons.c = pylons.tmpl_context
 pylons.g = pylons.app_globals
 from pylons import c
-from ming.orm import session
 
-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 allura.tests import decorators as td
+from alluratest.controller import TestRestApiBase
 
 
 class TestTrackerApiBase(TestRestApiBase):
 
     def setUp(self):
         super(TestTrackerApiBase, self).setUp()
+        self.setup_with_tools()
+
+    @td.with_tracker
+    def setup_with_tools(self):
         h.set_context('test', 'bugs', neighborhood='Projects')
         self.tracker_globals = c.app.globals
 
@@ -108,6 +110,3 @@ class TestRestDiscussion(TestTrackerApiBase):
         assert reply.json['post']['text'] == 'This is a reply', reply.json
         thread = self.api_post('/rest/p/test/bugs/_discuss/thread/%s/' % discussion['threads'][0]['_id'])
         assert len(thread.json['thread']['posts']) == 2, thread.json
-
-
-

--- a/ForgeTracker/forgetracker/tests/functional/test_root.py
+++ b/ForgeTracker/forgetracker/tests/functional/test_root.py
@@ -4,18 +4,27 @@ import Image, StringIO
 import allura
 
 from mock import patch
-from nose.tools import assert_true, assert_false, eq_, assert_equal
+from nose.tools import assert_true, assert_false, assert_equal
 from formencode.variabledecode import variable_encode
 
-from alluratest.controller import TestController, REGISTRY
+from alluratest.controller import TestController
 from allura import model as M
 from forgewiki import model as wm
 from forgetracker import model as tm
 
 from allura.lib import helpers as h
+from allura.tests import decorators as td
 from ming.orm.ormsession import ThreadLocalORMSession
 
 class TrackerTestController(TestController):
+    def setUp(self):
+        super(TrackerTestController, self).setUp()
+        self.setup_with_tools()
+
+    @td.with_tracker
+    def setup_with_tools(self):
+        pass
+
     def new_ticket(self, mount_point='/bugs/', **kw):
         response = self.app.get(mount_point + 'new/')
         form = response.forms[1]
@@ -118,6 +127,7 @@ class TestFunctionalController(TrackerTestController):
         r = self.app.get('/p/test/bugs/feed.atom')
         assert 'Private Ticket' not in r
 
+    @td.with_tool('test', 'Tickets', 'doc-bugs')
     def test_two_trackers(self):
         summary = 'test two trackers'
         ticket_view = self.new_ticket('/doc-bugs/', summary=summary, _milestone='1.0').follow()
@@ -766,6 +776,11 @@ class TestMilestoneAdmin(TrackerTestController):
         assert tm.Ticket.query.find({
             'custom_fields._releases': '1.1'}).count() == 1
 
+def post_install_hook(app):
+    role_anon = M.ProjectRole.by_name('*anonymous')._id
+    app.config.acl.append(M.ACE.allow(role_anon, 'post'))
+    app.config.acl.append(M.ACE.allow(role_anon, 'write'))
+
 class TestEmailMonitoring(TrackerTestController):
     def __init__(self):
         super(TestEmailMonitoring, self).__init__()
@@ -786,6 +801,7 @@ class TestEmailMonitoring(TrackerTestController):
         assert email[0]['value'] == self.test_email
         assert mtype[0]['selected'] == 'selected'
 
+    @td.with_tool('test', 'Tickets', 'doc-bugs', post_install_hook=post_install_hook)
     @patch('forgetracker.model.ticket.Notification.send_direct')
     def test_notifications_moderators(self, send_direct):
         self.new_ticket(summary='test moderation', mount_point='/doc-bugs/')

--- a/ForgeTracker/forgetracker/tests/test_controller.py
+++ b/ForgeTracker/forgetracker/tests/test_controller.py
@@ -1,9 +1,11 @@
 from nose.tools import assert_true
 
+from allura.tests import decorators as td
 from alluratest.controller import TestController
 
 
 class TestRootController(TestController):
+    @td.with_tracker
     def test_index(self):
         response = self.app.get('/bugs/')
         assert_true('bugs' in response)

--- a/ForgeTracker/forgetracker/tests/test_tracker_roles.py
+++ b/ForgeTracker/forgetracker/tests/test_tracker_roles.py
@@ -3,9 +3,14 @@ from pylons import c, g
 from alluratest.controller import setup_basic_test, setup_global_objects
 from allura import model as M
 from allura.lib import security
+from allura.tests import decorators as td
 
 def setUp():
     setup_basic_test()
+    setup_with_tools()
+
[e-mail]_tracker
+def setup_with_tools():
     setup_global_objects()
     g.set_app('bugs')
 

--- a/ForgeWiki/forgewiki/tests/functional/test_root.py
+++ b/ForgeWiki/forgewiki/tests/functional/test_root.py
@@ -9,6 +9,7 @@ from ming.orm.ormsession import ThreadLocalORMSession
 
 from allura import model as M
 from allura.lib import helpers as h
+from allura.tests import decorators as td
 from alluratest.controller import TestController
 
 from forgewiki import model
@@ -22,6 +23,14 @@ from forgewiki import model
 #     reply, delete
 
 class TestRootController(TestController):
+    def setUp(self):
+        super(TestRootController, self).setUp()
+        self.setup_with_tools()
+
+    @td.with_wiki
+    def setup_with_tools(self):
+        pass
+
     def test_root_index(self):
         r = self.app.get('/wiki/tést/').follow()
         assert 'tést' in r

--- a/ForgeWiki/forgewiki/tests/test_wiki_roles.py
+++ b/ForgeWiki/forgewiki/tests/test_wiki_roles.py
@@ -5,9 +5,14 @@ from nose.tools import assert_equal
 from alluratest.controller import setup_basic_test, setup_global_objects
 from allura import model as M
 from allura.lib import security
+from allura.tests import decorators as td
 
 def setUp():
     setup_basic_test()
+    setup_with_tools()
+
[e-mail]_wiki
+def setup_with_tools():
     setup_global_objects()
     g.set_app('wiki')