Merge lp:~osomon/elisa/fix_amp_cookie_traceback into lp:elisa

[Olivier Tilloy]

This branch fixes an issue when elisa is run on top of a recent version of twisted (e.g. that of Ubuntu Lucid): lots of tracebacks are spit out on the console with the following error message: "twisted.protocols.amp.InvalidSignature: cookie is not a valid argument".

The problem had been there forever, I guess older versions of twisted were more permissive and ignored the invalid argument. The fix is trivial, too.

The careful reviewer will verify that the traceback is gone and that the unit tests for the amp plugin all pass (they were previously broken).

[Guillaume Emont (guijemont)]

was there any bug report for this?

[Olivier Tilloy (osomon)]

> was there any bug report for this?

Not that I know of.

[Guillaume Emont (guijemont)]

It does fix the tracebacks and most of the amp unit tests, in a trivial manner.

It should be noted though that elisa.plugins.amp.tests.test_amp.UnixMasterTestCase.testSlavesPingTimeout still fails, though not all the time. This failure seems unlikely to be due to this change though, hence my approval.

review: Approve

=== modified file 'elisa-plugins/elisa/plugins/amp/protocol.py'
--- elisa-plugins/elisa/plugins/amp/protocol.py	2009-11-09 15:44:51 +0000
+++ elisa-plugins/elisa/plugins/amp/protocol.py	2010-05-27 13:20:59 +0000
@@ -106,7 +106,7 @@
         if diff < self.ping_period:
             return
 
-        dfr = self.callRemote(Ping, cookie=self._cookie)
+        dfr = self.callRemote(Ping)
         self._startTimeout()
         dfr.addCallback(self._pingCb)
         dfr.addErrback(self._pingEb)