incubator-allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tvansteenbu...@apache.org
Subject [11/50] git commit: [#3154] merge fix conflict
Date Wed, 28 Aug 2013 14:34:52 GMT
[#3154] merge fix conflict


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

Branch: refs/heads/tv/6526
Commit: e564195accf974e013e3123c3c25f864ef9d6c7a
Parents: 1e05343
Author: Dave Brondsema <dbrondsema@slashdotmedia.com>
Authored: Fri Aug 16 18:33:37 2013 +0000
Committer: Dave Brondsema <dbrondsema@slashdotmedia.com>
Committed: Thu Aug 22 20:04:45 2013 +0000

----------------------------------------------------------------------
 Allura/allura/tests/functional/test_admin.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/e564195a/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 9703b76..4988a8c 100644
--- a/Allura/allura/tests/functional/test_admin.py
+++ b/Allura/allura/tests/functional/test_admin.py
@@ -821,7 +821,7 @@ class TestExport(TestController):
         assert_not_in('Search</label> <a href="/p/test/search/">/p/test/search/</a>',
r)
 
     def test_export_page_contains_hidden_tools(self):
-        with patch('allura.ext.search.search_main.SearchApp.exportable'):
+        with mock.patch('allura.ext.search.search_main.SearchApp.exportable'):
             project = M.Project.query.get(shortname='test')
             exportable_tools = AdminApp.exportable_tools_for(project)
             tools = [t.options.mount_point for t in exportable_tools
@@ -851,7 +851,7 @@ class TestExport(TestController):
         export_tasks.bulk_export.post.assert_called_once_with(
             'test', [u'wiki', u'wiki2'], u'test-admin', u'Projects')
 
-    @patch('allura.ext.admin.admin_main.export_tasks')
+    @mock.patch('allura.ext.admin.admin_main.export_tasks')
     def test_export_in_progress(self, export_tasks):
         p = M.Project.query.get(shortname='test')
         tmpdir = os.path.join(p.bulk_export_path(), p.shortname)
@@ -890,4 +890,3 @@ class TestExport(TestController):
     def test_bulk_export_path_for_nbhd(self):
         project = M.Project.query.get(name='Home Project for Projects')
         assert_equals(project.bulk_export_path(), '/tmp/bulk_export/p/p')
-


Mime
View raw message