Merge lp:~nataliabidart/ubuntuone-control-panel/stable-3-0-update-2.99.1 into lp:ubuntuone-control-panel/stable-3-0

[Natalia Bidart]

[ Diego Sarmentero <email address hidden> ]
  - Fix dirty reactor.
[ Roberto Alsina <email address hidden> ]
  - When selecting "Quit Ubuntu One" from the tray context menu,
    shutdown syncdaemon (LP: #908888).
  - Make addfolder open the file dialog in $HOME instead of in the
    working directory (LP: #906541).

[dobey (dobey)]

review: Approve

[dobey (dobey)]

Please fix the commit message to not say "ralsina" :)

review: Needs Fixing

[dobey (dobey)]

review: Approve

=== modified file 'ubuntuone/controlpanel/gui/qt/addfolder.py'
--- ubuntuone/controlpanel/gui/qt/addfolder.py	2011-09-07 16:56:39 +0000
+++ ubuntuone/controlpanel/gui/qt/addfolder.py	2012-01-03 16:24:14 +0000
@@ -57,7 +57,8 @@
         """The 'Sync another folder' button was clicked."""
         # The options argument is because of LP: #835013
         folder = QtGui.QFileDialog.getExistingDirectory(
-            parent=self, options=QtGui.QFileDialog.DontUseNativeDialog)
+            parent=self, directory=os.path.expanduser('~'),
+            options=QtGui.QFileDialog.DontUseNativeDialog)
         folder = unicode(QtCore.QDir.toNativeSeparators(folder))
         logger.debug('on_add_folder_button_clicked: user requested folder '
                      'creation for path %r', folder)

=== 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	2012-01-03 16:24:14 +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_addfolder.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_addfolder.py	2011-10-05 16:35:59 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_addfolder.py	2012-01-03 16:24:14 +0000
@@ -83,6 +83,7 @@
         self.assertEqual(FakedFileDialog.args, ())
         self.assertEqual(FakedFileDialog.kwargs, {
             'options': gui.QtGui.QFileDialog.DontUseNativeDialog,
+            'directory': os.path.expanduser('~'),
             'parent': self.ui,
         })
 

=== 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	2012-01-03 16:24:14 +0000
@@ -1,103 +1,126 @@
-# -*- coding: utf-8 -*-
-
-# Author: Roberto Alsina <[e-mail]>
-#
-# Copyright 2011 Canonical Ltd.
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
-# PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-"""Tests for the notification area icon."""
-
-from PyQt4 import QtGui
-
-from ubuntuone.controlpanel.gui.qt.systray import TrayIcon
-from ubuntuone.controlpanel.tests import TestCase
-import ubuntuone.controlpanel.gui.qt.gui
-
-
-class FakeMainWindow(QtGui.QWidget):
-
-    """Fake Main Window."""
-
-    def __init__(self, *args, **kwargs):
-        self.args = (args, kwargs)
-        super(FakeMainWindow, self).__init__()
-
-
-class SystrayTestCase(TestCase):
-
-    """Test the notification area icon."""
-
-    def test_quit(self):
-        """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()
-        tray.quit.trigger()
-        self.assertEqual(self._called, ((False,), {}))
-
-    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()
-        self.assertEqual(tray.window, None)
-        tray.restore.trigger()
-        self.assertIsInstance(tray.window, FakeMainWindow)
-        self.assertTrue(tray.window.isVisible())
-        self.assertEqual(tray.window.args, ((),
-            {'close_callback': tray.delete_window}))
-
-    def test_activate(self):
-        """Test the icon activation."""
-        tray = TrayIcon()
-        window = FakeMainWindow()
-        tray.window = window
-        self.assertFalse(tray.window.isVisible())
-        tray.activated.emit(tray.Trigger)
-        self.assertEqual(tray.window, window)
-        self.assertTrue(tray.window.isVisible())
-
-    def test_restore_window(self):
-        """Test the restore window option in the menu, with a window."""
-        tray = TrayIcon()
-        window = FakeMainWindow()
-        tray.window = window
-        self.assertFalse(tray.window.isVisible())
-        tray.restore.trigger()
-        self.assertEqual(tray.window, window)
-        self.assertTrue(tray.window.isVisible())
-
-    def test_delete_window(self):
-        """Test deleting an existing window."""
-        tray = TrayIcon()
-        window = FakeMainWindow()
-        tray.window = window
-        tray.delete_window()
-        self.assertEqual(tray.window, None)
-        self.assertFalse(window.isVisible())
-
-    def test_delete_no_window(self):
-        """Test deleting without an existing window."""
-        tray = TrayIcon()
-        tray.delete_window()
-        self.assertEqual(tray.window, None)
-
-    def test_initialization(self):
-        """Test that everything initializes correctly."""
-        tray = TrayIcon()
-        self.assertTrue(tray.isVisible())
-        self.assertEqual(tray.window, None)
-        self.assertIsInstance(tray.context_menu, QtGui.QMenu)
-        self.assertFalse(tray.icon() == None)
+# -*- coding: utf-8 -*-
+
+# Author: Roberto Alsina <[e-mail]>
+#
+# Copyright 2011 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 3, as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranties of
+# MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+# PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Tests for the notification area icon."""
+
+from PyQt4 import QtGui
+from twisted.internet import reactor
+from twisted.internet.defer import inlineCallbacks
+
+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."""
+
+    def __init__(self, *args, **kwargs):
+        self.args = (args, kwargs)
+        super(FakeMainWindow, self).__init__()
+
+
+class SystrayTestCase(TestCase):
+
+    """Test the notification area icon."""
+
+    def test_quit(self):
+        """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(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)
+        self.patch(reactor, "stop", lambda: None)
+        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 = systray.TrayIcon()
+        self.assertEqual(tray.window, None)
+        tray.restore.trigger()
+        self.assertIsInstance(tray.window, FakeMainWindow)
+        self.assertTrue(tray.window.isVisible())
+        self.assertEqual(tray.window.args, ((),
+            {'close_callback': tray.delete_window}))
+
+    def test_activate(self):
+        """Test the icon activation."""
+        tray = systray.TrayIcon()
+        window = FakeMainWindow()
+        tray.window = window
+        self.assertFalse(tray.window.isVisible())
+        tray.activated.emit(tray.Trigger)
+        self.assertEqual(tray.window, window)
+        self.assertTrue(tray.window.isVisible())
+
+    def test_restore_window(self):
+        """Test the restore window option in the menu, with a window."""
+        tray = systray.TrayIcon()
+        window = FakeMainWindow()
+        tray.window = window
+        self.assertFalse(tray.window.isVisible())
+        tray.restore.trigger()
+        self.assertEqual(tray.window, window)
+        self.assertTrue(tray.window.isVisible())
+
+    def test_delete_window(self):
+        """Test deleting an existing window."""
+        tray = systray.TrayIcon()
+        window = FakeMainWindow()
+        tray.window = window
+        tray.delete_window()
+        self.assertEqual(tray.window, None)
+        self.assertFalse(window.isVisible())
+
+    def test_delete_no_window(self):
+        """Test deleting without an existing window."""
+        tray = systray.TrayIcon()
+        tray.delete_window()
+        self.assertEqual(tray.window, None)
+
+    def test_initialization(self):
+        """Test that everything initializes correctly."""
+        tray = systray.TrayIcon()
+        self.assertTrue(tray.isVisible())
+        self.assertEqual(tray.window, None)
+        self.assertIsInstance(tray.context_menu, QtGui.QMenu)
+        self.assertFalse(tray.icon() == None)