incubator-allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From john...@apache.org
Subject [15/20] git commit: [#6628] ticket:434 use generic "From address" in export emails
Date Tue, 10 Sep 2013 15:11:16 GMT
[#6628]  ticket:434 use generic "From address" in export emails


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

Branch: refs/heads/cj/6540
Commit: e2840fed6480cdce166962f52e8e6cc4ea300aab
Parents: 4eb88f5
Author: Yuriy Arhipov <yuriyarhipovua@yandex.ru>
Authored: Mon Sep 9 12:03:27 2013 +0400
Committer: Tim Van Steenburgh <tvansteenburgh@gmail.com>
Committed: Tue Sep 10 13:04:26 2013 +0000

----------------------------------------------------------------------
 Allura/allura/tasks/export_tasks.py | 2 +-
 Allura/allura/tests/test_tasks.py   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/e2840fed/Allura/allura/tasks/export_tasks.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tasks/export_tasks.py b/Allura/allura/tasks/export_tasks.py
index d06105e..8146b0f 100644
--- a/Allura/allura/tasks/export_tasks.py
+++ b/Allura/allura/tasks/export_tasks.py
@@ -91,7 +91,7 @@ def _bulk_export(project, tools, user):
         'not_exported_tools': not_exported_tools,
     }
     email = {
-        'fromaddr': unicode(user.email_address_header()),
+        'fromaddr': unicode(tg.config['forgemail.return_path']),
         'reply_to': unicode(user.email_address_header()),
         'message_id': h.gen_message_id(),
         'destinations': [unicode(user._id)],

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/e2840fed/Allura/allura/tests/test_tasks.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/test_tasks.py b/Allura/allura/tests/test_tasks.py
index 80ecdfa..9123fa3 100644
--- a/Allura/allura/tests/test_tasks.py
+++ b/Allura/allura/tests/test_tasks.py
@@ -380,6 +380,7 @@ class TestExportTasks(unittest.TestCase):
             dict(task_name='allura.tasks.mail_tasks.sendmail')).all()
         assert_equal(len(tasks), 1)
         assert_equal(tasks[0].kwargs['subject'], 'Bulk export for project test completed')
+        assert_equal(tasks[0].kwargs['fromaddr'], 'noreply@sourceforge.net')
         text = tasks[0].kwargs['text']
         assert_in('The bulk export for project test is completed.', text)
         assert_in('The following tools were exported:\n- wiki', text)


Mime
View raw message