issue2550877 partly fixed.

  * Added docstring hint to _get_mail().
  * Fixed FROM: lines in testMultipartRFC822() and testUnknownUser()

Author: bernhardreiter

test/test_mailgw.py

@@ -198,6 +198,11 @@ def _handle_mail(self, message, args=(), trap_exc=0):
         return handler.main(StringIO(message))
 
     def _get_mail(self):
+        """Reads an email that has been written to file via debug output.
+
+        Note: the resulting email will have three leading extra lines
+        written by the self.debug code branch in Mailer.smtp_send().
+        """
         f = open(SENDMAILDEBUG)
         try:
             return f.read()
@@ -1001,7 +1006,8 @@ def testMultipartRFC822(self):
             self.assertEqual(f.name, name)
         self.assertEqual(msg.content, 'First part: Text')
         self.compareMessages(self._get_mail(),
-'''TO: [email protected], [email protected]
+'''FROM: [email protected]
+TO: [email protected], [email protected]
 Content-Type: text/plain; charset="utf-8"
 Subject: [issue1] Testing...
 To: [email protected], [email protected]
@@ -2040,7 +2046,7 @@ def testUnknownUser(self):
         # trap_exc=1: we want a bounce message:
         ret = self._handle_mail(message, trap_exc=1)
         self.compareMessages(self._get_mail(),
-'''FROM: Roundup issue tracker <[email protected]>
+'''FROM: [email protected]
 TO: [email protected]
 From nobody Tue Jul 14 12:04:11 2009
 Content-Type: multipart/mixed; boundary="===============0639262320=="