Merge lp:~ralsina/ubuntuone-control-panel/fix_908888 into lp:ubuntuone-control-panel

[Roberto Alsina]

When selecting "Quit Ubuntu One" from the tray context menu, shutdown syncdaemon.

When selecting "Quit Ubuntu One" from the tray context menu, shutdown syncdaemon.

[Roman Yepishev (rye)]

Now when Ubuntu One control panel's quit systray menu item is selected, ubuntuone-syncdaemon.exe quits.
ubuntu-sso-login keeps working.

<rye> ralsina, hm, ubuntu-sso-login.exe keeps working though
<ralsina> rye: yes
<rye> ralsina, but syncdaemon is stopped, true
<ralsina> rye: I am not sure we even want to stop it
<ralsina> rye: cool

review: Approve (fieldtest)

[Guillermo Gonzalez (verterok)]

looks ok.

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

=== modified file 'ubuntuone/controlpanel/gui/qt/systray.py'
--- ubuntuone/controlpanel/gui/qt/systray.py	2011-09-14 20:25:55 +0000
+++ ubuntuone/controlpanel/gui/qt/systray.py	2011-12-27 18:52:24 +0000
@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-
-# Authors: Roberto Alsina <[e-mail]>
 #
 # Copyright 2011 Canonical Ltd.
 #
@@ -18,6 +16,9 @@
 """System notification area icon."""
 
 from PyQt4 import QtGui
+from twisted.internet.defer import inlineCallbacks
+
+from ubuntuone.platform.tools import SyncDaemonTool
 
 
 class TrayIcon(QtGui.QSystemTrayIcon):
@@ -60,8 +61,18 @@
             self.window.close()
             self.window = None
 
-    def stop(self):
+    @inlineCallbacks
+    def stop(self, *args, **kwargs):
         """Stop the application."""
+        # Stop syncdaemon
+        # pylint: disable=W0702
+        # Really, if it fails we can't do anything about it.
+        try:
+            st = SyncDaemonTool()
+            yield st.quit()
+        except:
+            # Maybe it was not running?
+            pass
         # pylint: disable=W0404
         from twisted.internet import reactor
         # pylint: enable=W0404

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_systray.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_systray.py	2011-09-07 17:33:09 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_systray.py	2011-12-27 18:52:24 +0000
@@ -19,12 +19,24 @@
 """Tests for the notification area icon."""
 
 from PyQt4 import QtGui
+from twisted.internet.defer import inlineCallbacks
 
-from ubuntuone.controlpanel.gui.qt.systray import TrayIcon
+from ubuntuone.controlpanel.gui.qt import systray
 from ubuntuone.controlpanel.tests import TestCase
 import ubuntuone.controlpanel.gui.qt.gui
 
 
+class FakeSDTool(object):
+
+    """Fake SyncDaemonTool."""
+
+    called = False
+
+    def quit(self):
+        """Fake quit."""
+        self.called = True
+
+
 class FakeMainWindow(QtGui.QWidget):
 
     """Fake Main Window."""
@@ -42,16 +54,25 @@
         """Test the quit option in the menu."""
         # Not done on setup, because if I patch stop
         # after instantiation, it doesn't get called.
-        self.patch(TrayIcon, "stop", self._set_called)
-        tray = TrayIcon()
+        self.patch(systray.TrayIcon, "stop", self._set_called)
+        tray = systray.TrayIcon()
         tray.quit.trigger()
         self.assertEqual(self._called, ((False,), {}))
 
+    @inlineCallbacks
+    def test_stop_sd(self):
+        """Quit should call SyncDaemonTool.quit()."""
+        st = FakeSDTool()
+        self.patch(systray, "SyncDaemonTool", lambda: st)
+        tray = systray.TrayIcon()
+        yield tray.stop()
+        self.assertTrue(st.called)
+
     def test_restore_no_window(self):
         """Test the restore window option in the menu, with no window."""
         self.patch(ubuntuone.controlpanel.gui.qt.gui,
             "MainWindow", FakeMainWindow)
-        tray = TrayIcon()
+        tray = systray.TrayIcon()
         self.assertEqual(tray.window, None)
         tray.restore.trigger()
         self.assertIsInstance(tray.window, FakeMainWindow)
@@ -61,7 +82,7 @@
 
     def test_activate(self):
         """Test the icon activation."""
-        tray = TrayIcon()
+        tray = systray.TrayIcon()
         window = FakeMainWindow()
         tray.window = window
         self.assertFalse(tray.window.isVisible())
@@ -71,7 +92,7 @@
 
     def test_restore_window(self):
         """Test the restore window option in the menu, with a window."""
-        tray = TrayIcon()
+        tray = systray.TrayIcon()
         window = FakeMainWindow()
         tray.window = window
         self.assertFalse(tray.window.isVisible())
@@ -81,7 +102,7 @@
 
     def test_delete_window(self):
         """Test deleting an existing window."""
-        tray = TrayIcon()
+        tray = systray.TrayIcon()
         window = FakeMainWindow()
         tray.window = window
         tray.delete_window()
@@ -90,13 +111,13 @@
 
     def test_delete_no_window(self):
         """Test deleting without an existing window."""
-        tray = TrayIcon()
+        tray = systray.TrayIcon()
         tray.delete_window()
         self.assertEqual(tray.window, None)
 
     def test_initialization(self):
         """Test that everything initializes correctly."""
-        tray = TrayIcon()
+        tray = systray.TrayIcon()
         self.assertTrue(tray.isVisible())
         self.assertEqual(tray.window, None)
         self.assertIsInstance(tray.context_menu, QtGui.QMenu)