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

[Eric Casteleijn]

Remove all notifications of connection made/lost events.

Remove all notifications of connection made/lost events.

[lp:~thisfred/ubuntuone-client/lp-737150]

924. By Eric Casteleijn on 2011-03-18

unchanged: attach bugC

[Roberto Alsina (ralsina)]

+1

review: Approve

[dobey (dobey)]

review: Approve

=== modified file 'tests/status/test_aggregator.py'
--- tests/status/test_aggregator.py	2011-03-14 18:36:26 +0000
+++ tests/status/test_aggregator.py	2011-03-18 13:57:38 +0000
@@ -1018,11 +1018,7 @@
         self.status_frontend.aggregator.connected = True
         self.listener.handle_SYS_CONNECTION_LOST()
         self.assertEqual(
-            1, len(self.status_frontend.notification.notifications_shown))
-        self.assertEqual(
-            (aggregator.UBUNTUONE_TITLE,
-             aggregator.ConnectionLostStatus.MESSAGE_ONE, None, False),
-            self.status_frontend.notification.notifications_shown[0])
+            0, len(self.status_frontend.notification.notifications_shown))
         self.assertFalse(self.status_frontend.aggregator.connected)
 
     def test_server_connection_made(self):
@@ -1030,11 +1026,7 @@
         self.status_frontend.aggregator.connected = False
         self.listener.handle_SYS_CONNECTION_MADE()
         self.assertEqual(
-            1, len(self.status_frontend.notification.notifications_shown))
-        self.assertEqual(
-            (aggregator.UBUNTUONE_TITLE,
-             aggregator.ConnectionMadeStatus.MESSAGE_ONE, None, False),
-            self.status_frontend.notification.notifications_shown[0])
+            0, len(self.status_frontend.notification.notifications_shown))
         self.assertTrue(self.status_frontend.aggregator.connected)
 
     def test_set_show_all_notifications(self):
 
=== modified file 'ubuntuone/status/aggregator.py'
--- ubuntuone/status/aggregator.py	2011-03-14 18:36:26 +0000
+++ ubuntuone/status/aggregator.py	2011-03-18 13:57:38 +0000
@@ -487,7 +487,7 @@
         self.timer = Timer(self.sleep_delay, clock=self.clock)
         self.timer.addCallback(self._timeout)
 
-    def _timeout(self, result):
+    def _timeout(self, _):
         """Show the bubble."""
         self.notification = self.status_aggregator.get_notification()
         text = self.status_aggregator.get_progress_message()
@@ -843,15 +843,11 @@
     def server_connection_lost(self):
         """The client lost the connection to the server."""
         logger.debug("server connection lost")
-        self.notification.send_notification(
-            UBUNTUONE_TITLE, ConnectionLostStatus().one())
         self.aggregator.connection_lost()
 
     def server_connection_made(self):
         """The client made the connection to the server."""
         logger.debug("server connection made")
-        self.notification.send_notification(
-            UBUNTUONE_TITLE, ConnectionMadeStatus().one())
         self.aggregator.connection_made()
 
     def set_show_all_notifications(self, value):