Merge lp:~therve/landscape-client/hardware-info-register into lp:~landscape/landscape-client/trunk

[Thomas Herve]

The fix is fairly simple. Previously the code was accumulating callbacks to "message-type-acceptance-changed", and firing them all at once when the server triggered it. So moving that call to register means that it only happens once, instead of once for every day of uptime.

[Björn Tillenius (bjornt)]

Looks good, +1

review: Approve

[Chris Glass (tribaal)]

Looks good! +1

review: Approve

=== modified file 'landscape/manager/hardwareinfo.py'
--- landscape/manager/hardwareinfo.py	2012-03-15 11:13:13 +0000
+++ landscape/manager/hardwareinfo.py	2012-09-20 07:07:21 +0000
@@ -13,10 +13,13 @@
     run_immediately = True
     command = "/usr/bin/lshw"
 
+    def register(self, registry):
+        super(HardwareInfo, self).register(registry)
+        self.call_on_accepted(self.message_type, self.send_message)
+
     def run(self):
-        self.call_on_accepted(self.message_type, self.send_message)
         return self.registry.broker.call_if_accepted(
-                self.message_type, self.send_message)
+            self.message_type, self.send_message)
 
     def send_message(self):
         result = getProcessOutput(

=== modified file 'landscape/manager/tests/test_hardwareinfo.py'
--- landscape/manager/tests/test_hardwareinfo.py	2012-03-15 11:13:13 +0000
+++ landscape/manager/tests/test_hardwareinfo.py	2012-09-20 07:07:21 +0000
@@ -43,3 +43,21 @@
                 [{"data": u"-xml -quiet\n", "type": "hardware-info"}])
 
         return deferred.addCallback(check)
+
+    def test_only_on_register(self):
+        """
+        C{call_on_accepted} is only called at register time, to not accumulate
+        callbacks to the "message-type-acceptance-changed" event.
+        """
+        calls = []
+        self.info.call_on_accepted = lambda x, y: calls.append((x, y))
+
+        deferred = self.info.run()
+
+        def check(ignored):
+            self.assertMessages(
+                self.broker_service.message_store.get_pending_messages(),
+                [{"data": u"-xml -quiet\n", "type": "hardware-info"}])
+            self.assertEqual([], calls)
+
+        return deferred.addCallback(check)