Fix file-unlink bug in mailgw

(Ralfs oversight when refactoring the mail gateway code) -- if a
message is sent that contains no attachments, all previous files of
the issue are unlinked, thanks to Rafal Bisingier for reporting and
proposing a fix.

I've now added a regression test that catches this issue.

Author: Ralf Schlatterbeck

CHANGES.txt

@@ -2,13 +2,21 @@ This file contains the changes to the Roundup system over time. The entries
 are given with the most recent entry first. If no other name is given,
 Richard Jones did the change.
 
-2011-XX-XX 1.X.XX (rXXXX)
+2011-05-29 1.4.18 (rXXXX)
 
 Features:
 
 - Norwegian Bokmal translation by Christian Aastorp
 - Allow to specify additional cc and bcc emails (not roundup users) for
-  nosymessage used by the nosyreaction reactor.
+  nosymessage used by the nosyreaction reactor. (Ralf)
+
+Fixed:
+
+- Fix file-unlink bug in mailgw (Ralfs oversight when refactoring the mail
+  gateway code) -- if a message is sent that contains no attachments,
+  all previous files of the issue are unlinked, thanks to Rafal
+  Bisingier for reporting and proposing a fix.
+  I've now added a regression test that catches this issue.
 
 2011-05-13 1.4.17 (r4605)
 

doc/acknowledgements.txt

@@ -14,6 +14,7 @@ Anthony Baxter,
 Marlon van den Berg,
 Bo Berglund,
 Stéphane Bidoul,
+Rafal Bisingier,
 Cameron Blackwood,
 Jeff Blaine,
 Duncan Booth,

roundup/mailgw.py

@@ -1058,7 +1058,7 @@ def create_files(self):
                 fileprop.extend(files)
                 files = fileprop
 
-        self.props['files'] = files
+            self.props['files'] = files
 
     def create_msg(self):
         ''' Create msg containing all the relevant information from the message
@@ -1093,7 +1093,8 @@ def create_msg(self):
             try:
                 message_id = self.db.msg.create(author=self.author,
                     recipients=self.recipients, date=date.Date('.'),
-                    summary=summary, content=content, files=self.props['files'],
+                    summary=summary, content=content,
+                    files=self.props.get('files',[]),
                     messageid=messageid, inreplyto=inreplyto, **msg_props)
             except exceptions.Reject, error:
                 raise MailUsageError, _("""

test/test_mailgw.py

@@ -625,6 +625,36 @@ def testMultipartKeepAlternatives(self):
                 self.assertEqual(f.content, content [n])
         self.assertEqual(msg.content, 'test attachment second text/plain')
 
+    def testMultipartKeepFiles(self):
+        self.doNewIssue()
+        self._handle_mail(self.multipart_msg)
+        messages = self.db.issue.get('1', 'messages')
+        messages.sort()
+        msg = self.db.msg.getnode (messages[-1])
+        assert(len(msg.files) == 5)
+        issue = self.db.issue.getnode ('1')
+        assert(len(issue.files) == 5)
+        names = {0 : 'first.dvi', 4 : 'second.dvi'}
+        content = {3 : 'test attachment third text/plain\n',
+                   4 : 'Just a test\n'}
+        for n, id in enumerate (msg.files):
+            f = self.db.file.getnode (id)
+            self.assertEqual(f.name, names.get (n, 'unnamed'))
+            if n in content :
+                self.assertEqual(f.content, content [n])
+        self.assertEqual(msg.content, 'test attachment second text/plain')
+        self._handle_mail('''From: mary <[email protected]>
+To: [email protected]
+Message-Id: <followup_dummy_id2>
+In-Reply-To: <dummy_test_message_id>
+Subject: [issue1] Testing...
+
+This ist a message without attachment
+''')
+        issue = self.db.issue.getnode ('1')
+        assert(len(issue.files) == 5)
+        self.assertEqual(issue.files, ['1', '2', '3', '4', '5'])
+
     def testMultipartDropAlternatives(self):
         self.doNewIssue()
         self.db.config.MAILGW_IGNORE_ALTERNATIVES = True