Merge lp:~facundo/magicicada-gui/fix-mq-asking into lp:magicicada-gui

[Facundo Batista]

Leave the "don't ask while asking" machinery ok if error while asking.

Leave the "don't ask while asking" machinery ok if error while asking.

We shouldn't have errors while asking, but if they happen (a new kind of message in MQ, for instance), the machinery was left in a wrong state, and no further MQ asking were done. This branch fixes it.

Test included.

[Natalia Bidart (nataliabidart)]

Good catch!

review: Approve

=== modified file 'magicicada/syncdaemon.py'
--- magicicada/syncdaemon.py	2010-10-14 03:48:37 +0000
+++ magicicada/syncdaemon.py	2010-10-25 10:52:44 +0000
@@ -271,7 +271,13 @@
         self._must_poll_mq = False
         self._mq_asking = ASKING_YES
         while self._mq_asking != ASKING_IDLE:
-            yield self._get_mq_data()
+            try:
+                yield self._get_mq_data()
+            except Exception:
+                # on any error, leave the state sane
+                self._mq_asking = ASKING_IDLE
+                raise
+
             if self._mq_asking == ASKING_LATER:
                 self._mq_asking = ASKING_YES
             else:

=== modified file 'magicicada/tests/test_syncdaemon.py'
--- magicicada/tests/test_syncdaemon.py	2010-10-14 03:48:37 +0000
+++ magicicada/tests/test_syncdaemon.py	2010-10-25 10:52:44 +0000
@@ -22,7 +22,7 @@
 import os
 import unittest
 
-from magicicada.syncdaemon import SyncDaemon, State
+from magicicada.syncdaemon import SyncDaemon, State, ASKING_IDLE
 from magicicada.tests.helpers import MementoHandler
 
 from twisted.trial.unittest import TestCase as TwistedTestCase
@@ -773,6 +773,23 @@
         # it should be called three times total
         self.assertEqual(len(called), 3)
 
+    @defer.inlineCallbacks
+    def test_mq_multiple_support_error(self):
+        """Leave the state ok even with an error in the underlying call."""
+        def fake():
+            """Fake."""
+            raise ValueError('foo')
+        self.sd.dbus.get_meta_queue = fake
+
+        # call it, and "absorb" the error we just generated
+        try:
+            yield self.sd.on_sd_meta_queue_changed()
+        except ValueError:
+            pass
+
+        # it should be in IDLE
+        self.assertEqual(self.sd._mq_asking, ASKING_IDLE)
+
 
 class StateTests(unittest.TestCase):
     """Test State class."""