traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use ndiffAssertEqual in a couple of places for better error reporting.

This commit is contained in:
Barry Warsaw 2003-03-10 16:59:34 +00:00
parent 20ebc37013
commit e1ff4bbce6
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Lib/email/test/test_email.py
View File

@ -1089,6 +1089,7 @@ From: bperson@dom.ain
''') ''')
def test_one_part_in_a_multipart(self): def test_one_part_in_a_multipart(self):
eq = self.ndiffAssertEqual
outer = MIMEBase('multipart', 'mixed') outer = MIMEBase('multipart', 'mixed')
outer['Subject'] = 'A subject' outer['Subject'] = 'A subject'
outer['To'] = 'aperson@dom.ain' outer['To'] = 'aperson@dom.ain'
@ -1098,7 +1099,7 @@ From: bperson@dom.ain
outer.set_boundary('BOUNDARY') outer.set_boundary('BOUNDARY')
msg = MIMEText('hello world') msg = MIMEText('hello world')
outer.attach(msg) outer.attach(msg)
self.assertEqual(outer.as_string(), '''\ eq(outer.as_string(), '''\
Content-Type: multipart/mixed; boundary="BOUNDARY" Content-Type: multipart/mixed; boundary="BOUNDARY"
MIME-Version: 1.0 MIME-Version: 1.0
Subject: A subject Subject: A subject
@ -1116,6 +1117,7 @@ hello world
''') ''')
def test_seq_parts_in_a_multipart(self): def test_seq_parts_in_a_multipart(self):
eq = self.ndiffAssertEqual
outer = MIMEBase('multipart', 'mixed') outer = MIMEBase('multipart', 'mixed')
outer['Subject'] = 'A subject' outer['Subject'] = 'A subject'
outer['To'] = 'aperson@dom.ain' outer['To'] = 'aperson@dom.ain'
@ -1125,7 +1127,7 @@ hello world
msg = MIMEText('hello world') msg = MIMEText('hello world')
outer.attach(msg) outer.attach(msg)
outer.set_boundary('BOUNDARY') outer.set_boundary('BOUNDARY')
self.assertEqual(outer.as_string(), '''\ eq(outer.as_string(), '''\
Content-Type: multipart/mixed; boundary="BOUNDARY" Content-Type: multipart/mixed; boundary="BOUNDARY"
MIME-Version: 1.0 MIME-Version: 1.0
Subject: A subject Subject: A subject
@ -1410,6 +1412,7 @@ Your message cannot be delivered to the following recipients:
'<002001c144a6$8752e060$56104586@oxy.edu>') '<002001c144a6$8752e060$56104586@oxy.edu>')
def test_epilogue(self): def test_epilogue(self):
eq = self.ndiffAssertEqual
fp = openfile('msg_21.txt') fp = openfile('msg_21.txt')
try: try:
text = fp.read() text = fp.read()
@ -1429,7 +1432,7 @@ Your message cannot be delivered to the following recipients:
sfp = StringIO() sfp = StringIO()
g = Generator(sfp) g = Generator(sfp)
g.flatten(msg) g.flatten(msg)
self.assertEqual(sfp.getvalue(), text) eq(sfp.getvalue(), text)
def test_no_nl_preamble(self): def test_no_nl_preamble(self):
eq = self.ndiffAssertEqual eq = self.ndiffAssertEqual