Merge lp:~facundo/magicicada-gui/dont-let-mq-die into lp:magicicada-gui

[Facundo Batista]

When calling last time to MQ updater, leave the caller in safe state.

[Natalia Bidart (nataliabidart)]

Bu, I got this:

[ERROR]: magicicada.tests.test_syncdaemon.MetaQueueChangedTests.test_mq_caller_is_reset_last_time

Traceback (most recent call last):
  File "/home/nessita/projects/magicicada/review_dont-let-mq-die/magicicada/tests/test_syncdaemon.py", line 498, in test_mq_caller_is_reset_last_time
    self.sd.current_state._set(name='QUEUE_MANAGER',
  File "/home/nessita/projects/magicicada/review_dont-let-mq-die/magicicada/syncdaemon.py", line 56, in __getattribute__
    return object.__getattribute__(self, name)
exceptions.AttributeError: 'State' object has no attribute '_set'

review: Needs Fixing

[lp:~facundo/magicicada-gui/dont-let-mq-die]

54. By Facundo Batista <facundo@exopus> on 2010-07-08

Merged trunk in

55. By Facundo Batista <facundo@exopus> on 2010-07-08

Fix the test for new API after cleaning.

[Natalia Bidart (nataliabidart)]

Now we're talking ;-)

review: Approve

=== modified file 'magicicada/syncdaemon.py'
--- magicicada/syncdaemon.py	2010-06-27 22:19:42 +0000
+++ magicicada/syncdaemon.py	2010-07-08 22:41:01 +0000
@@ -253,6 +253,7 @@
 
         if not self.current_state.processing_meta:
             logger.info("Check MQ called, States not in MQ, call a last time")
+            self._mqcaller = None
             self._get_mq_data()
         else:
             logger.info("Asking for MQ information")

=== modified file 'magicicada/tests/test_syncdaemon.py'
--- magicicada/tests/test_syncdaemon.py	2010-06-27 22:19:42 +0000
+++ magicicada/tests/test_syncdaemon.py	2010-07-08 22:41:01 +0000
@@ -480,6 +480,8 @@
                 changed('QUEUE_MANAGER', 'description', False, True, False,
                         'WORKING_ON_CONTENT', 'connection')
             elif len(called) == 2:
+                # check that the caller is set back to None
+                self.assertTrue(self.sd._mqcaller is None)
                 deferred.callback(True)
             return defer.succeed("foo")
 
@@ -490,6 +492,16 @@
                 'WORKING_ON_BOTH', 'connection')
         return deferred
 
+    def test_mq_caller_is_reset_last_time(self):
+        """When MQ is polled last time, the caller should be back to None."""
+        self.sd._mqcaller = reactor.callLater(100, lambda: None)
+        self.sd.current_state.set(name='QUEUE_MANAGER',
+                                  queues='WORKING_ON_CONTENT')
+
+        # call the method and check
+        self.sd._check_mq()
+        self.assertTrue(self.sd._mqcaller is None)
+
     def test_mq_polling_untilfinish(self):
         """Check that it polls mq until no more is needed."""
         # set the callback, and adjust the polling time to faster