Mercurial > p > roundup > code
comparison test/test_multipart.py @ 5649:f8893e1cde0d
assert_ is depricated. Replacing with assertTrue to reduce logs in travisci.
| author | John Rouillard <rouilj@ieee.org> |
|---|---|
| date | Fri, 15 Mar 2019 20:29:00 -0400 |
| parents | 081be318661b |
| children |
comparison
equal
deleted
inserted
replaced
| 5648:a4514df51ded | 5649:f8893e1cde0d |
|---|---|
| 113 w('\r\n--foo--\r\n') | 113 w('\r\n--foo--\r\n') |
| 114 self.fp.seek(0) | 114 self.fp.seek(0) |
| 115 | 115 |
| 116 def testMultipart(self): | 116 def testMultipart(self): |
| 117 m = email.message_from_file(self.fp, RoundupMessage) | 117 m = email.message_from_file(self.fp, RoundupMessage) |
| 118 self.assert_(m is not None) | 118 self.assertTrue(m is not None) |
| 119 | 119 |
| 120 it = iter(m.get_payload()) | 120 it = iter(m.get_payload()) |
| 121 | 121 |
| 122 # first text/plain | 122 # first text/plain |
| 123 p = next(it, None) | 123 p = next(it, None) |
| 124 self.assert_(p is not None) | 124 self.assertTrue(p is not None) |
| 125 self.assertEqual(p.get_content_type(), 'text/plain') | 125 self.assertEqual(p.get_content_type(), 'text/plain') |
| 126 self.assertEqual(p.get_payload(), | 126 self.assertEqual(p.get_payload(), |
| 127 'Hello, world!\r\n\r\nBlah blah\r\nfoo\r\n-foo\r\n') | 127 'Hello, world!\r\n\r\nBlah blah\r\nfoo\r\n-foo\r\n') |
| 128 | 128 |
| 129 # sub-multipart | 129 # sub-multipart |
| 130 p = next(it, None) | 130 p = next(it, None) |
| 131 self.assert_(p is not None) | 131 self.assertTrue(p is not None) |
| 132 self.assertEqual(p.get_content_type(), 'multipart/alternative') | 132 self.assertEqual(p.get_content_type(), 'multipart/alternative') |
| 133 | 133 |
| 134 # sub-multipart text/plain | 134 # sub-multipart text/plain |
| 135 qit = iter(p.get_payload()) | 135 qit = iter(p.get_payload()) |
| 136 q = next(qit, None) | 136 q = next(qit, None) |
| 137 self.assert_(q is not None) | 137 self.assertTrue(q is not None) |
| 138 self.assertEqual(q.get_content_type(), 'text/plain') | 138 self.assertEqual(q.get_content_type(), 'text/plain') |
| 139 self.assertEqual(q.get_payload(), 'Hello, world!\r\n\r\nBlah blah\r\n') | 139 self.assertEqual(q.get_payload(), 'Hello, world!\r\n\r\nBlah blah\r\n') |
| 140 | 140 |
| 141 # sub-multipart text/html | 141 # sub-multipart text/html |
| 142 q = next(qit, None) | 142 q = next(qit, None) |
| 143 self.assert_(q is not None) | 143 self.assertTrue(q is not None) |
| 144 self.assertEqual(q.get_content_type(), 'text/html') | 144 self.assertEqual(q.get_content_type(), 'text/html') |
| 145 self.assertEqual(q.get_payload(), '<b>Hello, world!</b>\r\n') | 145 self.assertEqual(q.get_payload(), '<b>Hello, world!</b>\r\n') |
| 146 | 146 |
| 147 # sub-multipart end | 147 # sub-multipart end |
| 148 q = next(qit, None) | 148 q = next(qit, None) |
| 149 self.assert_(q is None) | 149 self.assertTrue(q is None) |
| 150 | 150 |
| 151 # final text/plain | 151 # final text/plain |
| 152 p = next(it, None) | 152 p = next(it, None) |
| 153 self.assert_(p is not None) | 153 self.assertTrue(p is not None) |
| 154 self.assertEqual(p.get_content_type(), 'text/plain') | 154 self.assertEqual(p.get_content_type(), 'text/plain') |
| 155 self.assertEqual(p.get_payload(), | 155 self.assertEqual(p.get_payload(), |
| 156 'Last bit\n') | 156 'Last bit\n') |
| 157 | 157 |
| 158 # end | 158 # end |
| 159 p = next(it, None) | 159 p = next(it, None) |
| 160 self.assert_(p is None) | 160 self.assertTrue(p is None) |
| 161 | 161 |
| 162 def TestExtraction(self, spec, expected, convert_html_with=False): | 162 def TestExtraction(self, spec, expected, convert_html_with=False): |
| 163 if convert_html_with: | 163 if convert_html_with: |
| 164 from roundup.dehtml import dehtml | 164 from roundup.dehtml import dehtml |
| 165 html2text=dehtml(convert_html_with).html2text | 165 html2text=dehtml(convert_html_with).html2text |