allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From john...@apache.org
Subject [01/27] git commit: Exclude non-builtin apps from this test
Date Tue, 16 Jul 2013 20:17:02 GMT
Updated Branches:
  refs/heads/cj/4656 58cc0246c -> c78912c46 (forced update)


Exclude non-builtin apps from this test

Signed-off-by: Tim Van Steenburgh <tvansteenburgh@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/b8d0e6ac
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/b8d0e6ac
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/b8d0e6ac

Branch: refs/heads/cj/4656
Commit: b8d0e6ac000e6face2d8b5003be0635e896c3f5d
Parents: 584a728
Author: Tim Van Steenburgh <tvansteenburgh@gmail.com>
Authored: Wed Jul 10 17:49:31 2013 +0000
Committer: Tim Van Steenburgh <tvansteenburgh@gmail.com>
Committed: Wed Jul 10 17:49:31 2013 +0000

----------------------------------------------------------------------
 Allura/allura/tests/functional/test_admin.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/b8d0e6ac/Allura/allura/tests/functional/test_admin.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/functional/test_admin.py b/Allura/allura/tests/functional/test_admin.py
index 9535c36..8b1d703 100644
--- a/Allura/allura/tests/functional/test_admin.py
+++ b/Allura/allura/tests/functional/test_admin.py
@@ -155,10 +155,13 @@ class TestProjectAdmin(TestController):
         assert "uninstall tool test-tool" in r.body, r.body
 
     def test_tool_permissions(self):
+        BUILTIN_APPS = ['activity', 'blog', 'discussion', 'git', 'link',
+                'shorturl', 'svn', 'tickets', 'userstats', 'wiki']
         self.app.get('/admin/')
         for i, ep in enumerate(pkg_resources.iter_entry_points('allura')):
             app = ep.load()
-            if not app.installable: continue
+            if not app.installable or ep.name.lower() not in BUILTIN_APPS:
+                continue
             tool = ep.name
             with audits('install tool test-%d' % i):
                 self.app.post('/admin/update_mounts', params={


Mime
View raw message