odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] email_template: now inherit from TestMailMockups test class. 

bzr revid: tde@openerp.com-20120913114917-na341w0ja7n0ditu
This commit is contained in:
Thibault Delavallée 2012-09-13 13:49:17 +02:00
parent 25734f2cfd
commit 0e4422809b
2 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
addons/email_template/tests/test_mail.py
View File

@ -20,17 +20,10 @@
##############################################################################
import base64
from openerp.tests import common
from openerp.addons.mail.tests import test_mail
class test_message_compose(common.TransactionCase):
def _mock_smtp_gateway(self, *args, **kwargs):
return True
def _mock_build_email(self, *args, **kwargs):
self._build_email_args = args
self._build_email_kwargs = kwargs
return self.build_email_real(*args, **kwargs)
class test_message_compose(test_mail.TestMailMockups):
def setUp(self):
super(test_message_compose, self).setUp()
@ -40,11 +33,6 @@ class test_message_compose(common.TransactionCase):
self.res_users = self.registry('res.users')
self.res_partner = self.registry('res.partner')
# Install mock SMTP gateway
self.build_email_real = self.registry('ir.mail_server').build_email
self.registry('ir.mail_server').build_email = self._mock_build_email
self.registry('ir.mail_server').send_email = self._mock_smtp_gateway
# create a 'pigs' and 'bird' groups that will be used through the various tests
self.group_pigs_id = self.mail_group.create(self.cr, self.uid,
{'name': 'Pigs', 'description': 'Fans of Pigs, unite !'})

1
addons/portal/tests/test_portal.py
View File

@ -20,7 +20,6 @@
##############################################################################
from openerp.addons.mail.tests import test_mail
# from openerp.tests import common
from openerp.tools import append_content_to_html