Merge lp:~thisfred/ubuntuone-client/lp-732431 into lp:ubuntuone-client

[Eric Casteleijn]

fixes bug #732431: a callback was called with the wrong signature, and no tests exercised it. Both are fixed now.

fixes bug #732431: a callback was called with the wrong signature, and no tests exercised it. Both are fixed now.

[Roberto Alsina (ralsina)]

+1

review: Approve

[Alejandro J. Cura (alecu)]

review: Approve

=== modified file 'tests/status/test_aggregator.py'
--- tests/status/test_aggregator.py	2011-03-09 20:36:53 +0000
+++ tests/status/test_aggregator.py	2011-03-10 14:57:35 +0000
@@ -169,7 +169,7 @@
     def __init__(self):  # pylint: disable=W0231
         self.messages_shown = {}
         self.messages_updated = {}
-
+        self.callbacks = []
     # pylint: disable=R0913
     def show_message(self, sender, callback=None, message_time=None,
                      message_count=None, icon=None):
@@ -184,6 +184,14 @@
         """Update the count for an existing indicator."""
         self.messages_updated[sender] = (sender, add_count)
 
+    def _callback(self, indicator, message_time=None):
+        """Fake callback."""
+        self.callbacks.append((indicator, message_time))
+
+    def create_callback(self):
+        """Create the callback."""
+        return self._callback
+
 
 class FakeStatusAggregator(object):
     """A fake status aggregator."""
@@ -969,6 +977,10 @@
         self.assertEqual(None, msg[1])
         # msg did receive a count argument
         self.assertEqual(1, msg[2])
+        # call callback
+        print msg
+        msg[0]('fake_indicator')
+        self.assertEqual(1, len(self.status_frontend.messaging.callbacks))
 
     def test_two_new_udfs_available(self):
         """A new udf is available for subscription."""
@@ -1509,15 +1521,13 @@
             status99,
             status99,
             FakeStatus(12),
-            FakeStatus(1),
-        ]
+            FakeStatus(1)]
 
-        result = [ list(k) for j, k in aggregator.group_statuses(statuses) ]
+        result = [list(k) for _, k in aggregator.group_statuses(statuses)]
         expected = [
             [statuses[3]],
             [statuses[2]],
-            [status99, status99],
-        ]
+            [status99, status99]]
 
         self.assertEqual(result, expected)
 

=== modified file 'ubuntuone/platform/linux/messaging.py'
--- ubuntuone/platform/linux/messaging.py	2011-02-23 20:36:16 +0000
+++ ubuntuone/platform/linux/messaging.py	2011-03-10 14:57:35 +0000
@@ -90,7 +90,7 @@
             return indicator
     # pylint: enable=R0913
 
-    def create_callback(self, ):
+    def create_callback(self):
         """Create the callback to be used."""
 
         def callback(indicator, message_time=None):  # pylint: disable=W0613

=== modified file 'ubuntuone/status/aggregator.py'
--- ubuntuone/status/aggregator.py	2011-03-09 15:54:46 +0000
+++ ubuntuone/status/aggregator.py	2011-03-10 14:57:35 +0000
@@ -831,12 +831,11 @@
         self.notification.send_notification(
             UBUNTUONE_TITLE, UDFAvailableStatus(udf=udf).one())
 
-    # pylint: disable=W0613
     def _reset_udf_message_callback(self, indicator, message_time=None):
         """A callback wrapper that resets the udf_message to None."""
         self.udf_message = None
-        self.messaging.create_callback()()
-    # pylint: enable=W0613
+        callback = self.messaging.create_callback()
+        callback(indicator, message_time=message_time)
 
     def server_connection_lost(self):
         """The client lost the connection to the server."""