Make functionality for matching In-Reply-To and Message-Id work...

...even when the issue id differs from the message id..

Improved test.

Author: Erik Forsberg

roundup/mailgw.py

@@ -72,7 +72,7 @@ class node. Any parts of other types are each stored in separate files
 an exception, the original message is bounced back to the sender with the
 explanatory message given in the exception.
 
-$Id: mailgw.py,v 1.181 2007-01-21 15:18:26 forsberg Exp $
+$Id: mailgw.py,v 1.182 2007-01-21 18:08:31 forsberg Exp $
 """
 __docformat__ = 'restructuredtext'
 
@@ -720,7 +720,7 @@ def handle_message(self, message):
         if nodeid is None and inreplyto:
             l = self.db.getclass('msg').stringFind(messageid=inreplyto)
             if l:
-                nodeid = l[0]
+                nodeid = cl.filter(None, {'messages':l})[0]
 
         # title is optional too
         title = m.group('title')

test/test_mailgw.py

@@ -8,7 +8,7 @@
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 #
-# $Id: test_mailgw.py,v 1.81 2007-01-21 15:22:02 forsberg Exp $
+# $Id: test_mailgw.py,v 1.82 2007-01-21 18:08:31 forsberg Exp $
 
 # TODO: test bcc
 
@@ -1286,7 +1286,7 @@ def testCommandDelimitersIgnore(self):
         self.assertEqual(self.db.issue.get(nodeid, 'assignedto'), None)
 
     def testReplytoMatch(self):
-        self.instance.config.MAILGW_SUBJECT_PREFIX_PARSING = 'loose'        
+        self.instance.config.MAILGW_SUBJECT_PREFIX_PARSING = 'loose'
         nodeid = self.doNewIssue()
         nodeid2 = self._handle_mail('''Content-Type: text/plain;
   charset="iso-8859-1"
@@ -1298,8 +1298,20 @@ def testReplytoMatch(self):
 
 Followup message.
 ''')
-        self.assertEqual(nodeid, nodeid2)
 
+        nodeid3 = self._handle_mail('''Content-Type: text/plain;
+  charset="iso-8859-1"
+From: Chef <[email protected]>
+To: [email protected]
+Message-Id: <dummy_test_message_id3>
+In-Reply-To: <dummy_test_message_id2>
+Subject: Testing...
+
+Yet another message in the same thread/issue.
+''')        
+
+        self.assertEqual(nodeid, nodeid2)
+        self.assertEqual(nodeid, nodeid3)
 
 def test_suite():
     suite = unittest.TestSuite()