Merge lp:~elopio/u1-test-utils/fix1199098-delete_empty_inbox into lp:u1-test-utils

[Leo Arias]

Delete the messages only if they are present.

[lp:~elopio/u1-test-utils/fix1199098-delete_empty_inbox]

90. By Leo Arias on 2013-07-08

Added a comment about the added test.

91. By Leo Arias on 2013-07-08

Fixed pep8.

92. By Leo Arias on 2013-07-08

Fixed flakes.

[Natalia Bidart (nataliabidart)]

review: Approve

=== modified file 'u1testutils/mail.py'
--- u1testutils/mail.py	2013-01-18 18:53:55 +0000
+++ u1testutils/mail.py	2013-07-08 19:01:25 +0000
@@ -104,8 +104,9 @@
     def delete_msgs_sent_to(self, email_address):
         self.imap.select('Inbox')
         status, data = self.imap.search(None, 'TO', email_address)
-        if status == 'OK':
-            for num in reversed(data[0].split()):
+        message_numbers = data[0]
+        if status == 'OK' and message_numbers is not None:
+            for num in reversed(message_numbers.split()):
                 status, data = self.imap.fetch(num, '(RFC822)')
                 self.imap.store(num, '+FLAGS', r'\Deleted')
         self.imap.expunge()

=== modified file 'u1testutils/selftests/unit/test_mail.py'
--- u1testutils/selftests/unit/test_mail.py	2013-07-02 16:51:41 +0000
+++ u1testutils/selftests/unit/test_mail.py	2013-07-08 19:01:25 +0000
@@ -69,3 +69,8 @@
         self.assertEquals(latest_email['Subject'], message['Subject'])
         self.assertEquals(
             latest_email.get_payload(), message.get_payload() + '\n')
+
+    def test_delete_message_with_no_messages(self):
+        # Test for bug #1199098.
+        # It should not throw an exception.
+        mail.delete_msgs_sent_to('[e-mail]')