Mercurial > p > roundup > code
comparison test/test_mailgw.py @ 5502:497ab896397d
compare folded headers in mailgw tests
| author | Christof Meerwald <cmeerw@cmeerw.org> |
|---|---|
| date | Thu, 16 Aug 2018 19:23:14 +0100 |
| parents | b7fa56ced601 |
| children | 19bd4b413ed6 |
comparison
equal
deleted
inserted
replaced
| 5501:dd242cd7a182 | 5502:497ab896397d |
|---|---|
| 53 def get_body(message): | 53 def get_body(message): |
| 54 if not message.is_multipart(): | 54 if not message.is_multipart(): |
| 55 return message.get_payload() | 55 return message.get_payload() |
| 56 | 56 |
| 57 return message.as_string().split('\n\n', 1)[-1] | 57 return message.as_string().split('\n\n', 1)[-1] |
| 58 | |
| 59 def unfold(lst): | |
| 60 return [l.replace('\n', '') for l in lst] | |
| 58 | 61 |
| 59 | 62 |
| 60 class Tracker(object): | 63 class Tracker(object): |
| 61 def open(self, journaltag): | 64 def open(self, journaltag): |
| 62 return self.db | 65 return self.db |
| 129 # throw an error if we have differeing content types | 132 # throw an error if we have differeing content types |
| 130 if not newmimetype == oldmimetype: | 133 if not newmimetype == oldmimetype: |
| 131 res.append('content-type mime type headers differ new vs. reference: %r != %r'%(newmimetype, oldmimetype)) | 134 res.append('content-type mime type headers differ new vs. reference: %r != %r'%(newmimetype, oldmimetype)) |
| 132 replace ['--' + newmimeboundary] = '--' + oldmimeboundary | 135 replace ['--' + newmimeboundary] = '--' + oldmimeboundary |
| 133 replace ['--' + newmimeboundary + '--'] = '--' + oldmimeboundary + '--' | 136 replace ['--' + newmimeboundary + '--'] = '--' + oldmimeboundary + '--' |
| 134 elif new.get_all(key, '') != old.get_all(key, ''): | 137 elif unfold(new.get_all(key, '')) != unfold(old.get_all(key, '')): |
| 135 # check that all other headers are identical, including | 138 # check that all other headers are identical, including |
| 136 # headers that appear more than once. | 139 # headers that appear more than once. |
| 137 res.append(' %s: %r != %r' % (key, old.get_all(key, ''), | 140 res.append(' %s: %r != %r' % (key, old.get_all(key, ''), |
| 138 new.get_all(key, ''))) | 141 new.get_all(key, ''))) |
| 139 | 142 |