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

[Facundo Batista]

Poll MQ even if not in QUEUE_MANAGER.

[Natalia Bidart (nataliabidart)]

Yummy.

review: Approve

=== modified file 'magicicada/syncdaemon.py'
--- magicicada/syncdaemon.py	2010-05-27 12:45:13 +0000
+++ magicicada/syncdaemon.py	2010-05-27 23:30:45 +0000
@@ -198,8 +198,7 @@
     def _check_mq(self):
         """Check MQ if we should."""
         state = self.current_state
-        if state.name != 'QUEUE_MANAGER' or \
-           state.queues not in ('WORKING_ON_METADATA', 'WORKING_ON_BOTH'):
+        if state.queues not in ('WORKING_ON_METADATA', 'WORKING_ON_BOTH'):
             logger.info("Check MQ called but States not in MQ")
         else:
             logger.info("Asking for MQ information")

=== modified file 'magicicada/tests/test_syncdaemon.py'
--- magicicada/tests/test_syncdaemon.py	2010-05-27 12:45:13 +0000
+++ magicicada/tests/test_syncdaemon.py	2010-05-27 23:30:45 +0000
@@ -269,8 +269,7 @@
     def setUp(self):
         """Set up."""
         BaseTest.setUp(self)
-        self.sd.current_state._set(name='QUEUE_MANAGER',
-                                   queues='WORKING_ON_METADATA')
+        self.sd.current_state._set(queues='WORKING_ON_METADATA')
 
     @defer.inlineCallbacks
     def test_initial_value(self):
@@ -328,8 +327,24 @@
                                      False, 'queues', 'connection')
         self.assertTrue(called)
 
-    def test_mq_polling_workinginmetadata(self):
-        """Check that it polls mq while working in metadata."""
+    def test_mq_polling_workinginmetadata_notinqueuemanager(self):
+        """Check that it polls mq while working in metadata not being in QM."""
+        # set the callback
+        deferred = defer.Deferred()
+        def fake():
+            """Fake."""
+            deferred.callback(True)
+            return defer.succeed("foo")
+        self.sd.dbus.get_meta_queue = fake
+
+        # send status changed to working in metadata
+        self.sd.on_sd_status_changed('AUTHENTICATE', 'description', False,
+                                     True, False, 'WORKING_ON_METADATA',
+                                     'connection')
+        return deferred
+
+    def test_mq_polling_workinginmetadata_queuemanager(self):
+        """Check that it polls mq while working in metadata being in QM."""
         # set the callback
         deferred = defer.Deferred()
         def fake():
@@ -450,7 +465,7 @@
 
     def setUp(self):
         """Set up the test."""
-        self.sd = SyncDaemon()
+        self.sd = SyncDaemon(FakeDBusInterface)
 
         self._replaced = None
         self.called = False