You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2013/08/21 22:12:59 UTC
[43/50] git commit: [#3154] merge fix conflict
[#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/90488503
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/90488503
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/90488503
Branch: refs/heads/db/3154b
Commit: 9048850341399c317fc71b09430cede7d82c779e
Parents: f7cd3af
Author: Dave Brondsema <db...@slashdotmedia.com>
Authored: Fri Aug 16 18:33:37 2013 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Wed Aug 21 18:12:28 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/90488503/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')
-