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 CDAF110209 for ; Wed, 13 Nov 2013 22:57:21 +0000 (UTC) Received: (qmail 22367 invoked by uid 500); 13 Nov 2013 22:57:21 -0000 Delivered-To: apmail-incubator-allura-commits-archive@incubator.apache.org Received: (qmail 22312 invoked by uid 500); 13 Nov 2013 22:57:21 -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 22276 invoked by uid 99); 13 Nov 2013 22:57:21 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 13 Nov 2013 22:57:21 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 7FA468A8A8E; Wed, 13 Nov 2013 22:57:21 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: johnsca@apache.org To: allura-commits@incubator.apache.org Date: Wed, 13 Nov 2013 22:57:23 -0000 Message-Id: <371e4ae7d97d45ad8c605aac1ecadaa3@git.apache.org> In-Reply-To: <1e65682cb3ea45d5a692aebdf39a9d35@git.apache.org> References: <1e65682cb3ea45d5a692aebdf39a9d35@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [03/44] git commit: [#6860] Add CC to smtp envelope addrs [#6860] Add CC to smtp envelope addrs Signed-off-by: Tim Van Steenburgh Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/f1c92401 Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/f1c92401 Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/f1c92401 Branch: refs/heads/cj/6815 Commit: f1c92401cb32d79afe22509175c70f9da8320053 Parents: 35eeee5 Author: Tim Van Steenburgh Authored: Fri Nov 8 21:00:02 2013 +0000 Committer: Tim Van Steenburgh Committed: Fri Nov 8 21:00:02 2013 +0000 ---------------------------------------------------------------------- Allura/allura/lib/mail_util.py | 1 + Allura/allura/tests/test_tasks.py | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/f1c92401/Allura/allura/lib/mail_util.py ---------------------------------------------------------------------- diff --git a/Allura/allura/lib/mail_util.py b/Allura/allura/lib/mail_util.py index ef0cc71..78fcc78 100644 --- a/Allura/allura/lib/mail_util.py +++ b/Allura/allura/lib/mail_util.py @@ -217,6 +217,7 @@ class SMTPClient(object): message['Sender'] = AddrHeader(sender) if cc: message['CC'] = AddrHeader(cc) + addrs.append(cc) if in_reply_to: if not isinstance(in_reply_to, basestring): raise TypeError('Only strings are supported now, not lists') http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/f1c92401/Allura/allura/tests/test_tasks.py ---------------------------------------------------------------------- diff --git a/Allura/allura/tests/test_tasks.py b/Allura/allura/tests/test_tasks.py index 23aab99..13c6f7f 100644 --- a/Allura/allura/tests/test_tasks.py +++ b/Allura/allura/tests/test_tasks.py @@ -344,6 +344,22 @@ class TestMailTasks(unittest.TestCase): assert_in('From: "Test Admin" ', body) assert_in('References: ', body) + def test_cc(self): + c.user = M.User.by_username('test-admin') + with mock.patch.object(mail_tasks.smtp_client, '_client') as _client: + mail_tasks.sendsimplemail( + fromaddr=str(c.user._id), + toaddr='test@mail.com', + text=u'This is a test', + reply_to=u'noreply@sf.net', + subject=u'Test subject', + cc=u'someone@example.com', + message_id=h.gen_message_id()) + assert_equal(_client.sendmail.call_count, 1) + return_path, rcpts, body = _client.sendmail.call_args[0] + assert_in('CC: someone@example.com', body) + assert_in('someone@example.com', rcpts) + @td.with_wiki def test_receive_email_ok(self): c.user = M.User.by_username('test-admin')