allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject [1/2] git commit: [#6692] fix export tests
Date Fri, 01 Nov 2013 14:24:32 GMT
Updated Branches:
  refs/heads/master 94ac7ea27 -> 5adec29a7


[#6692] fix export tests


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

Branch: refs/heads/master
Commit: d002a111a7cec1457cbda7f5670b93057c49cf12
Parents: 94ac7ea
Author: Dave Brondsema <dbrondsema@slashdotmedia.com>
Authored: Fri Nov 1 03:26:45 2013 +0000
Committer: Dave Brondsema <dbrondsema@slashdotmedia.com>
Committed: Fri Nov 1 03:36:01 2013 +0000

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


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/d002a111/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 4af8d5b..49992fd 100644
--- a/Allura/allura/tests/functional/test_admin.py
+++ b/Allura/allura/tests/functional/test_admin.py
@@ -929,13 +929,13 @@ class TestExport(TestController):
     def test_selected_one_tool(self, export_tasks):
         r = self.app.post('/admin/export', {'tools': u'wiki'})
         assert_in('ok', self.webflash(r))
-        export_tasks.bulk_export.post.assert_called_once_with([u'wiki'], 'test.zip')
+        export_tasks.bulk_export.post.assert_called_once_with([u'wiki'], 'test.zip', send_email=True)
 
     @mock.patch('allura.ext.admin.admin_main.export_tasks')
     def test_selected_multiple_tools(self, export_tasks):
         r = self.app.post('/admin/export', {'tools': [u'wiki', u'wiki2']})
         assert_in('ok', self.webflash(r))
-        export_tasks.bulk_export.post.assert_called_once_with([u'wiki', u'wiki2'], 'test.zip')
+        export_tasks.bulk_export.post.assert_called_once_with([u'wiki', u'wiki2'], 'test.zip',
send_email=True)
 
     def test_export_in_progress(self):
         from allura.tasks import export_tasks
@@ -1025,4 +1025,4 @@ class TestRestExport(TestRestApiBase):
                 'filename': 'test.zip',
                 'status': 'in progress',
             })
-        bulk_export.post.assert_called_once_with(['tickets', 'discussion'], 'test.zip')
+        bulk_export.post.assert_called_once_with(['tickets', 'discussion'], 'test.zip', send_email=False)


Mime
View raw message