[Erp5-report] r31766 leonardo - /erp5/trunk/products/ERP5/tests/testCRM.py

[nobody at svn.erp5.org]

Author: leonardo
Date: Thu Jan 14 23:37:27 2010
New Revision: 31766

URL: http://svn.erp5.org?rev=31766&view=rev
Log:
more e-mail normalization test fixes

Modified:
    erp5/trunk/products/ERP5/tests/testCRM.py

Modified: erp5/trunk/products/ERP5/tests/testCRM.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testCRM.py?rev=31766&r1=31765&r2=31766&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testCRM.py [utf8] (original)
+++ erp5/trunk/products/ERP5/tests/testCRM.py [utf8] Thu Jan 14 23:37:27 2010
@@ -605,14 +605,18 @@
     if 'recipient' not in portal.person_module.contentIds():
       portal.person_module.newContent(
               id='recipient',
-              title='Recipient',
+              # The ',' below is to force quoting of the name in e-mail
+              # addresses on Zope 2.12
+              title='Recipient,',
               subordination_value=customer_organisation,
               default_email_text='recipient at example.com')
     if 'me' not in portal.person_module.contentIds():
       # also create the sender
       portal.person_module.newContent(
               id='me',
-              title='Me',
+              # The ',' below is to force quoting of the name in e-mail
+              # addresses on Zope 2.12
+              title='Me,',
               default_email_text='me at erp5.org')
 
     # set preference
@@ -657,8 +661,8 @@
     last_message = self.portal.MailHost._last_message
     self.assertNotEquals((), last_message)
     mfrom, mto, messageText = last_message
-    self.assertEquals('"Me" <me at erp5.org>', mfrom)
-    self.assertEquals(['"Recipient" <recipient at example.com>'], mto)
+    self.assertEquals('"Me," <me at erp5.org>', mfrom)
+    self.assertEquals(['"Recipient," <recipient at example.com>'], mto)
     
     message = email.message_from_string(messageText)
 
@@ -688,10 +692,10 @@
     self.assertNotEquals((), last_message_2)
     # check last message 1 and last message 2 (the order is random)
     # both should have 'From: Me'
-    self.assertEquals(['"Me" <me at erp5.org>', '"Me" <me at erp5.org>'],
+    self.assertEquals(['"Me," <me at erp5.org>', '"Me," <me at erp5.org>'],
                       [x[0] for x in (last_message_1, last_message_2)])
     # one should have 'To: Me' and the other should have 'To: Recipient'
-    self.assertEquals([['"Me" <me at erp5.org>'], ['"Recipient" <recipient at example.com>']],
+    self.assertEquals([['"Me," <me at erp5.org>'], ['"Recipient," <recipient at example.com>']],
                       sorted([x[1] for x in (last_message_1, last_message_2)]))
 
   def test_MailFromMailMessageEventNoSendMail(self):
@@ -761,8 +765,8 @@
     last_message = self.portal.MailHost._last_message
     self.assertNotEquals((), last_message)
     mfrom, mto, messageText = last_message
-    self.assertEquals('"Me" <me at erp5.org>', mfrom)
-    self.assertEquals(['"Recipient" <recipient at example.com>'], mto)
+    self.assertEquals('"Me," <me at erp5.org>', mfrom)
+    self.assertEquals(['"Recipient," <recipient at example.com>'], mto)
 
     message = email.message_from_string(messageText)
     part = None
@@ -786,8 +790,8 @@
     last_message = self.portal.MailHost._last_message
     self.assertNotEquals((), last_message)
     mfrom, mto, messageText = last_message
-    self.assertEquals('"Me" <me at erp5.org>', mfrom)
-    self.assertEquals(['"Recipient" <recipient at example.com>'], mto)
+    self.assertEquals('"Me," <me at erp5.org>', mfrom)
+    self.assertEquals(['"Recipient," <recipient at example.com>'], mto)
     
     message = email.message_from_string(messageText)