Return-Path: X-Original-To: apmail-incubator-allura-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-allura-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 64C1B10D7C for ; Tue, 10 Sep 2013 13:04:55 +0000 (UTC) Received: (qmail 29654 invoked by uid 500); 10 Sep 2013 13:04:54 -0000 Delivered-To: apmail-incubator-allura-commits-archive@incubator.apache.org Received: (qmail 29606 invoked by uid 500); 10 Sep 2013 13:04:54 -0000 Mailing-List: contact allura-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: allura-dev@incubator.apache.org Delivered-To: mailing list allura-commits@incubator.apache.org Received: (qmail 29590 invoked by uid 99); 10 Sep 2013 13:04:53 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 10 Sep 2013 13:04:53 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 0B0BE89F152; Tue, 10 Sep 2013 13:04:53 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tvansteenburgh@apache.org To: allura-commits@incubator.apache.org Date: Tue, 10 Sep 2013 13:04:53 -0000 Message-Id: In-Reply-To: <050037f0944543d8bae4179cd47358fc@git.apache.org> References: <050037f0944543d8bae4179cd47358fc@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: [#6628] ticket:434 use generic "From address" in export emails [#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/master Commit: e2840fed6480cdce166962f52e8e6cc4ea300aab Parents: 4eb88f5 Author: Yuriy Arhipov Authored: Mon Sep 9 12:03:27 2013 +0400 Committer: Tim Van Steenburgh 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)