From 72dfe4a09ccd803f25741c72eb14b58aa1b27277 Mon Sep 17 00:00:00 2001 From: Kazuhiko Shiozaki <kazuhiko@nexedi.com> Date: Mon, 13 Dec 2010 10:44:41 +0000 Subject: [PATCH] modify assertions to get more meaningful errors in case of failure. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@41383 20353a03-c40f-0410-a6d1-a30d3c3de9de --- product/ERP5OOo/tests/testDeferredStyle.py | 23 +++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/product/ERP5OOo/tests/testDeferredStyle.py b/product/ERP5OOo/tests/testDeferredStyle.py index 18045b5a8e..46825b55d5 100644 --- a/product/ERP5OOo/tests/testDeferredStyle.py +++ b/product/ERP5OOo/tests/testDeferredStyle.py @@ -104,11 +104,12 @@ class TestDeferredStyle(ERP5TypeTestCase, ZopeTestCase.Functional): for part in mail_message.walk(): content_type = part.get_content_type() file_name = part.get_filename() - # "History" is the title of Base_viewHistory form - if file_name == 'History%s' % self.attachment_file_extension: - self.assertEquals(content_type, self.content_type) - self.assertEquals('attachment; filename="History%s"' % - self.attachment_file_extension, + if content_type == self.content_type: + # "History" is the title of Base_viewHistory form + file_name = part.get_filename() + expected_file_name = 'History%s' % self.attachment_file_extension + self.assertEquals(expected_file_name, file_name) + self.assertEquals('attachment; filename="%s"' % expected_file_name, part.get('Content-Disposition')) data = part.get_payload(decode=True) error_list = Validator().validate(data) @@ -138,12 +139,12 @@ class TestDeferredStyle(ERP5TypeTestCase, ZopeTestCase.Functional): mail_message = email.message_from_string(message_text) for part in mail_message.walk(): content_type = part.get_content_type() - file_name = part.get_filename() - # "Person" is the title of Person_view form - if file_name == 'Person%s' % self.attachment_file_extension: - self.assertEquals(content_type, self.content_type) - self.assertEquals('attachment; filename="Person%s"' % - self.attachment_file_extension, + if content_type == self.content_type: + # "Person" is the title of Person_view form + file_name = part.get_filename() + expected_file_name = 'Person%s' % self.attachment_file_extension + self.assertEquals(expected_file_name, file_name) + self.assertEquals('attachment; filename="%s"' % expected_file_name, part.get('Content-Disposition')) data = part.get_payload(decode=True) error_list = Validator().validate(data) -- 2.30.9