Merge lp:~diegosarmentero/ubuntuone-control-panel/menu-desktop-services-actions into lp:ubuntuone-control-panel

[Diego Sarmentero]

- Adding open (folder, program, url) actions to the menu (LP: #1034542)

[Manuel de la Peña (mandel)]

Some small fixes:

icon is always not None, I suppose it is icon_name

127 + icon = QtGui.QIcon()
128 + if icon is not None:
129 + icon = icon_from_name(icon_name)
130 + text = data.get('msg')
131 + self.status.setIcon(icon)
132 + self.status.setText(text)

Possible attr error:

135 + self._backend_method = getattr(self.backend, data['backend_method'])

A little cleaner way:

326 + @inlineCallbacks
327 + def test_refresh_status(self):
328 + """Test that it receives the proper information from syncdaemon."""
329 + yield self.ui.refresh_status()

do instead:

def test_refresh_status(self):
    """Test that it receives the proper information from syncdaemon."""
    return self.ui.refresh_status()

Tests can return deferreds so no need for the inlineCallbacks

The following is a personal thing, ignore it if you wish:

signal_pairs = (
    (self.status_action, self.change_status)
    (self.open_u1, self.restore_window)
    (self.open_u1_folder, self.open_u1_folder_action)
    (self.get_more_storage, self.get_more_storage_action)
    (self.go_to_web, self.go_to_web_action)
    (self.get_help_online, self.get_help_action)
    (self.quit, self.stop)
)

for button, callback in signal_pairs:
    button.triggered.connect(callback)

Instead of:

# Connect Signals
self.status_action.triggered.connect(self.change_status)
self.open_u1.triggered.connect(self.restore_window)
self.open_u1_folder.triggered.connect(self.open_u1_folder_action)
self.get_more_storage.triggered.connect(self.get_more_storage_action)
self.go_to_web.triggered.connect(self.go_to_web_action)
self.get_help_online.triggered.connect(self.get_help_action)
self.quit.triggered.connect(self.stop)

review: Needs Fixing

[Manuel de la Peña (mandel)]

Looks good to me.

review: Approve

[Brian Curtin (brian.curtin)]

Agree on the last part with iterating over signal_pairs.

[Brian Curtin (brian.curtin)]

You still have TODO's on lines 73, 79, and 81.

review: Needs Fixing

[Diego Sarmentero (diegosarmentero)]

> You still have TODO's on lines 73, 79, and 81.

Yes, those are for the future branches i'm working right now

[Brian Curtin (brian.curtin)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~diegosarmentero/ubuntuone-control-panel/menu-desktop-services-actions into lp:ubuntuone-control-panel failed. Below is the output from the failed tests.

*** Running DBus test suite ***
ubuntuone.controlpanel.dbustests.test_dbus_service
  BaseTestCase
    runTest ... [OK]
  DBusServiceMainTestCase
    test_dbus_service_cant_register ... Control panel backend already running.
                                   [OK]
    test_dbus_service_main ... [OK]
  DBusServiceTestCase
    test_cant_register_twice ... [SKIPPED]
    test_dbus_busname_created ... [OK]
    test_error_handler_default ... [OK]
    test_error_handler_with_exception ... [OK]
    test_error_handler_with_failure ... [OK]
    test_error_handler_with_non_string_dict ... [OK]
    test_error_handler_with_string_dict ... [OK]
    test_register_service ... [OK]
  FileSyncTestCase
    test_file_sync_status_changed ... [OK]
    test_file_sync_status_disabled ... [OK]
    test_file_sync_status_disconnected ... [OK]
    test_file_sync_status_error ... [OK]
    test_file_sync_status_idle ... [OK]
    test_file_sync_status_starting ... [OK]
    test_file_sync_status_stopped ... [OK]
    test_file_sync_status_syncing ... [OK]
    test_file_sync_status_unknown ... [OK]
    test_status_changed_handler ... [OK]
    test_status_changed_handler_after_status_requested ... [OK]
    test_status_changed_handler_after_status_requested_twice ... [OK]
  OperationsAuthErrorTestCase
    test_account_info_returned ... [OK]
    test_change_device_settings ... [OK]
    test_change_replication_settings ... [OK]
    test_change_volume_settings ... [OK]
    test_connect_files ... [OK]
    test_devices_info_returned ... [OK]
    test_disable_files ... [OK]
    test_disconnect_files ... [OK]
    test_enable_files ... [OK]
    test_remove_device ... [OK]
    test_replications_info ... [OK]
    test_restart_files ... ...

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~diegosarmentero/ubuntuone-control-panel/menu-desktop-services-actions into lp:ubuntuone-control-panel failed. Below is the output from the failed tests.

*** Running DBus test suite ***
ubuntuone.controlpanel.dbustests.test_dbus_service
  BaseTestCase
    runTest ... [OK]
  DBusServiceMainTestCase
    test_dbus_service_cant_register ... Control panel backend already running.
                                   [OK]
    test_dbus_service_main ... [OK]
  DBusServiceTestCase
    test_cant_register_twice ... [SKIPPED]
    test_dbus_busname_created ... [OK]
    test_error_handler_default ... [OK]
    test_error_handler_with_exception ... [OK]
    test_error_handler_with_failure ... [OK]
    test_error_handler_with_non_string_dict ... [OK]
    test_error_handler_with_string_dict ... [OK]
    test_register_service ... [OK]
  FileSyncTestCase
    test_file_sync_status_changed ... [OK]
    test_file_sync_status_disabled ... [OK]
    test_file_sync_status_disconnected ... [OK]
    test_file_sync_status_error ... [OK]
    test_file_sync_status_idle ... [OK]
    test_file_sync_status_starting ... [OK]
    test_file_sync_status_stopped ... [OK]
    test_file_sync_status_syncing ... [OK]
    test_file_sync_status_unknown ... [OK]
    test_status_changed_handler ... [OK]
    test_status_changed_handler_after_status_requested ... [OK]
    test_status_changed_handler_after_status_requested_twice ... [OK]
  OperationsAuthErrorTestCase
    test_account_info_returned ... [OK]
    test_change_device_settings ... [OK]
    test_change_replication_settings ... [OK]
    test_change_volume_settings ... [OK]
    test_connect_files ... [OK]
    test_devices_info_returned ... [OK]
    test_disable_files ... [OK]
    test_disconnect_files ... [OK]
    test_enable_files ... [OK]
    test_remove_device ... [OK]
    test_replications_info ... [OK]
    test_restart_files ... ...

[lp:~diegosarmentero/ubuntuone-control-panel/menu-desktop-services-actions]

349. By Diego Sarmentero on 2012-08-14

fixing pep8 issue

=== modified file 'ubuntuone/controlpanel/gui/qt/systray.py'
--- ubuntuone/controlpanel/gui/qt/systray.py	2012-08-13 12:08:15 +0000
+++ ubuntuone/controlpanel/gui/qt/systray.py	2012-08-14 19:00:25 +0000
@@ -15,13 +15,14 @@
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 """System notification area icon."""
 
-from PyQt4 import QtGui
+from PyQt4 import QtGui, QtCore
 from twisted.internet.defer import inlineCallbacks
 from ubuntuone.platform.tools import SyncDaemonTool
 
 from ubuntuone.controlpanel import backend, cache
 from ubuntuone.controlpanel.logger import setup_logging
 from ubuntuone.controlpanel.gui import (
+<<<<<<< TREE
     LOADING,
     OPEN_UBUNTU_ONE,
     PLEASE_WAIT,
@@ -37,6 +38,29 @@
 
 
 class TrayIcon(QtGui.QSystemTrayIcon, cache.Cache):
+=======
+    DASHBOARD,
+    GET_HELP_ONLINE,
+    GET_MORE_STORAGE,
+    GET_STORAGE_LINK,
+    GET_SUPPORT_LINK,
+    GO_TO_WEB,
+    LOADING,
+    OPEN_UBUNTU_ONE,
+    OPEN_UBUNTU_ONE_FOLDER,
+    PLEASE_WAIT,
+)
+from ubuntuone.controlpanel.gui.qt import (
+    FILE_SYNC_STATUS,
+    icon_from_name,
+)
+
+
+logger = setup_logging('qt.systray')
+
+
+class TrayIcon(QtGui.QSystemTrayIcon, cache.Cache):
+>>>>>>> MERGE-SOURCE
 
     """System notification icon."""
 
@@ -45,10 +69,20 @@
         self.setIcon(QtGui.QIcon(":/icon.png"))
         self.setVisible(True)
         self.window = window
-        self._backend_method = None
-
-        # Items
+<<<<<<< TREE
+        self._backend_method = None
+
+        # Items
+=======
+        self.root_path = ''
+        self.recent_transfers = {}
+        self.uploading = {}
+        self._backend_method = None
+
+        # Items
+>>>>>>> MERGE-SOURCE
         self.context_menu = QtGui.QMenu()
+<<<<<<< TREE
 
         self.status = self.context_menu.addAction(LOADING)
         self.status.setEnabled(False)
@@ -61,56 +95,165 @@
 
         self.quit = self.context_menu.addAction(QUIT_LABEL)
 
+=======
+
+        self.status = self.context_menu.addAction(LOADING)
+        self.status.setEnabled(False)
+        self.status_action = self.context_menu.addAction(PLEASE_WAIT)
+        self.refresh_status()
+        self.context_menu.addSeparator()
+
+        self.open_u1 = self.context_menu.addAction(OPEN_UBUNTU_ONE)
+        # TODO: Share a file action when the Shares tab is ready in U1-CP
+        self.open_u1_folder = self.context_menu.addAction(
+            OPEN_UBUNTU_ONE_FOLDER)
+        self.go_to_web = self.context_menu.addAction(GO_TO_WEB)
+        self.context_menu.addSeparator()
+
+        # TODO: Shares
+
+        # TODO: Transfers
+
+        self.get_more_storage = self.context_menu.addAction(GET_MORE_STORAGE)
+        self.get_help_online = self.context_menu.addAction(GET_HELP_ONLINE)
+        self.quit = self.context_menu.addAction("Quit")
+
+>>>>>>> MERGE-SOURCE
         self.setContextMenu(self.context_menu)
 
-        # Connect Signals
-        self.status_action.triggered.connect(self.change_status)
-        self.open_u1.triggered.connect(self.restore_window)
-        self.quit.triggered.connect(self.stop)
-
+<<<<<<< TREE
+        # Connect Signals
+        self.status_action.triggered.connect(self.change_status)
+        self.open_u1.triggered.connect(self.restore_window)
+        self.quit.triggered.connect(self.stop)
+
+=======
+        # Connect Signals
+        self.status_action.triggered.connect(self.change_status)
+        self.open_u1.triggered.connect(self.restore_window)
+        self.open_u1_folder.triggered.connect(self.open_u1_folder_action)
+        self.get_more_storage.triggered.connect(self.get_more_storage_action)
+        self.go_to_web.triggered.connect(self.go_to_web_action)
+        self.get_help_online.triggered.connect(self.get_help_action)
+        self.quit.triggered.connect(self.stop)
+
+>>>>>>> MERGE-SOURCE
         self.close_callback = close_callback
-
-    @inlineCallbacks
-    def refresh_status(self):
-        """Update Ubuntu One status."""
-        info = yield self.backend.file_sync_status()
-        self._process_status(info)
-        self.backend.status_changed_handler = self._process_status
-
-    def _process_status(self, status):
-        """Match status with signals."""
-        if status is None:
-            return
-        try:
-            status_key = status[backend.STATUS_KEY]
-            data = FILE_SYNC_STATUS[status_key]
-        except (KeyError, TypeError):
-            logger.exception(
-                '_process_status: received unknown status dict %r', status)
-            return
-
-        self.status_action.setEnabled(True)
-        icon_name = data.get('icon')
-        icon = QtGui.QIcon()
-        if icon_name is not None:
-            icon = icon_from_name(icon_name)
-        text = data.get('msg')
-        self.status.setIcon(icon)
-        self.status.setText(text)
-
-        action = data.get('action')
-        self._backend_method = getattr(self.backend,
-            data['backend_method'], None)
-        self.status_action.setText(action)
-
-    def change_status(self):
-        """Change the Syncing status of syncdaemon."""
-        if self._backend_method is not None:
-            self.status_action.setEnabled(False)
-            self._backend_method()
-        else:
-            logger.error('on_sync_status_button_clicked: backend method is '
-                         'None!')
+<<<<<<< TREE
+
+    @inlineCallbacks
+    def refresh_status(self):
+        """Update Ubuntu One status."""
+        info = yield self.backend.file_sync_status()
+        self._process_status(info)
+        self.backend.status_changed_handler = self._process_status
+
+    def _process_status(self, status):
+        """Match status with signals."""
+        if status is None:
+            return
+        try:
+            status_key = status[backend.STATUS_KEY]
+            data = FILE_SYNC_STATUS[status_key]
+        except (KeyError, TypeError):
+            logger.exception(
+                '_process_status: received unknown status dict %r', status)
+            return
+
+        self.status_action.setEnabled(True)
+        icon_name = data.get('icon')
+        icon = QtGui.QIcon()
+        if icon_name is not None:
+            icon = icon_from_name(icon_name)
+        text = data.get('msg')
+        self.status.setIcon(icon)
+        self.status.setText(text)
+
+        action = data.get('action')
+        self._backend_method = getattr(self.backend,
+            data['backend_method'], None)
+        self.status_action.setText(action)
+
+    def change_status(self):
+        """Change the Syncing status of syncdaemon."""
+        if self._backend_method is not None:
+            self.status_action.setEnabled(False)
+            self._backend_method()
+        else:
+            logger.error('on_sync_status_button_clicked: backend method is '
+                         'None!')
+=======
+        self._get_volumes_info()
+
+    @inlineCallbacks
+    def refresh_status(self):
+        """Update Ubuntu One status."""
+        info = yield self.backend.file_sync_status()
+        self._process_status(info)
+        self.backend.status_changed_handler = self._process_status
+
+    def _process_status(self, status):
+        """Match status with signals."""
+        if status is None:
+            return
+        try:
+            status_key = status[backend.STATUS_KEY]
+            data = FILE_SYNC_STATUS[status_key]
+        except (KeyError, TypeError):
+            logger.exception(
+                '_process_status: received unknown status dict %r', status)
+            return
+
+        self.status_action.setEnabled(True)
+        icon_name = data.get('icon')
+        icon = QtGui.QIcon()
+        if icon_name is not None:
+            icon = icon_from_name(icon_name)
+        text = data.get('msg')
+        self.status.setIcon(icon)
+        self.status.setText(text)
+
+        action = data.get('action')
+        self._backend_method = getattr(self.backend,
+            data['backend_method'], None)
+        self.status_action.setText(action)
+
+    def change_status(self):
+        """Change the Syncing status of syncdaemon."""
+        if self._backend_method is not None:
+            self.status_action.setEnabled(False)
+            self._backend_method()
+        else:
+            logger.error('on_sync_status_button_clicked: backend method is '
+                         'None!')
+
+    @inlineCallbacks
+    def _get_volumes_info(self):
+        """Get the volumes info."""
+        info = yield self.backend.volumes_info()
+        self._process_volumes_info(info)
+
+    def _process_volumes_info(self, info):
+        """Process the volumes info."""
+        _, _, volumes = info[0]
+        self.root_path = u'file://%s' % unicode(volumes[0]['path'])
+
+    def open_u1_folder_action(self):
+        """Open the web to get more storage."""
+        QtGui.QDesktopServices.openUrl(QtCore.QUrl(self.root_path))
+
+    def get_more_storage_action(self):
+        """Open the web to get more storage."""
+        QtGui.QDesktopServices.openUrl(QtCore.QUrl(GET_STORAGE_LINK))
+
+    def go_to_web_action(self):
+        """Open the web in the dashboard."""
+        QtGui.QDesktopServices.openUrl(QtCore.QUrl(DASHBOARD))
+
+    def get_help_action(self):
+        """Open the web in the dashboard."""
+        QtGui.QDesktopServices.openUrl(QtCore.QUrl(GET_SUPPORT_LINK))
+>>>>>>> MERGE-SOURCE
 
     def restore_window(self):
         """Show the main window."""

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_systray.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_systray.py	2012-08-10 20:01:40 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_systray.py	2012-08-14 19:00:25 +0000
@@ -18,13 +18,27 @@
 
 """Tests for the notification area icon."""
 
-from PyQt4 import QtGui
+from PyQt4 import QtGui, QtCore
 from twisted.internet.defer import inlineCallbacks
 
-from ubuntuone.controlpanel.gui import qt
+<<<<<<< TREE
+from ubuntuone.controlpanel.gui import qt
+=======
+import ubuntuone.controlpanel.gui.qt.gui
+from ubuntuone.controlpanel.gui import qt
+>>>>>>> MERGE-SOURCE
 from ubuntuone.controlpanel.gui.qt import systray
+<<<<<<< TREE
 from ubuntuone.controlpanel.gui.qt.tests import BaseTestCase
 import ubuntuone.controlpanel.gui.qt.gui
+=======
+from ubuntuone.controlpanel.gui.qt.tests import BaseTestCase
+from ubuntuone.controlpanel.tests import ROOT_PATH
+
+
+# pylint: disable=C0103, W0212
+backend = systray.backend
+>>>>>>> MERGE-SOURCE
 
 
 backend = systray.backend  # pylint: disable=C0103
@@ -50,10 +64,28 @@
         super(FakeMainWindow, self).__init__()
 
 
-class SystrayTestCase(BaseTestCase):
+<<<<<<< TREE
+class SystrayTestCase(BaseTestCase):
+=======
+class FakeDesktopService(object):
+
+    """Fake QDesktopService."""
+
+    data = {}
+
+    @classmethod
+    def openUrl(cls, url):
+        """Fake openUrl."""
+        FakeDesktopService.data['cls'] = cls
+        FakeDesktopService.data['url'] = url
+
+
+class SystrayTestCase(BaseTestCase):
+>>>>>>> MERGE-SOURCE
 
     """Test the notification area icon."""
 
+<<<<<<< TREE
     class_ui = systray.TrayIcon
 
     # pylint: disable=W0212
@@ -182,6 +214,129 @@
         self.assertTrue(data['called'])
         self.assertEqual(data['status'], [])
 
+=======
+    class_ui = systray.TrayIcon
+
+    @inlineCallbacks
+    def setUp(self):
+        yield super(SystrayTestCase, self).setUp()
+        self.patch(QtGui, "QDesktopServices", FakeDesktopService)
+
+    def assert_status_correct(self, status_bd, status_ui, action,
+                              callback=None):
+        """The shown status is correct."""
+        expected_text = status_ui
+
+        status = {backend.STATUS_KEY: status_bd}
+        self.ui._process_status(status)
+
+        actual_text = unicode(self.ui.status.text())
+        self.assertEqual(expected_text, actual_text)
+
+        self.assertFalse(self.ui.status.isEnabled())
+        self.assertEqual(unicode(self.ui.status_action.text()), action)
+
+        self.ui.status_action.trigger()
+        self.assertFalse(self.ui.status_action.isEnabled())
+        self.assert_backend_called(callback)
+
+    def test_process_info_invalid_status(self):
+        """File sync status invalid, ignore event."""
+        status = {backend.STATUS_KEY: backend.FILE_SYNC_STARTING,
+                  backend.MSG_KEY: qt.FILE_SYNC_STARTING,
+                  'icon': backend.FILE_SYNC_STARTING}
+        self.ui._process_status(status)
+        self.ui._process_status(3)
+
+        actual_text = unicode(self.ui.status.text())
+        self.assertEqual(qt.FILE_SYNC_STARTING, actual_text)
+
+    def test_process_info_changed(self):
+        """Backend's file sync status changed callback is connected."""
+        self.ui.refresh_status()
+        self.assertEqual(self.ui.backend.status_changed_handler,
+                         self.ui._process_status)
+
+    def test_process_info_disabled(self):
+        """File sync status disabled update the label."""
+        self.ui.refresh_status()
+        self.assert_status_correct(status_bd=backend.FILE_SYNC_DISABLED,
+                                   status_ui=qt.FILE_SYNC_DISABLED,
+                                   action=qt.FILE_SYNC_ENABLE,
+                                   callback='enable_files')
+
+    def test_process_info_disconnected(self):
+        """File sync status disconnected update the label."""
+        self.assert_status_correct(status_bd=backend.FILE_SYNC_DISCONNECTED,
+                                   status_ui=qt.FILE_SYNC_DISCONNECTED,
+                                   action=qt.FILE_SYNC_CONNECT,
+                                   callback='connect_files')
+
+    def test_process_info_error(self):
+        """File sync status error update the label."""
+        msg = qt.WARNING_MARKUP % qt.FILE_SYNC_ERROR
+        self.assert_status_correct(status_bd=backend.FILE_SYNC_ERROR,
+                                   status_ui=msg,
+                                   action=qt.FILE_SYNC_RESTART,
+                                   callback='restart_files')
+
+    def test_process_info_idle(self):
+        """File sync status idle update the label."""
+        self.assert_status_correct(status_bd=backend.FILE_SYNC_IDLE,
+                                   status_ui=qt.FILE_SYNC_IDLE,
+                                   action=qt.FILE_SYNC_DISCONNECT,
+                                   callback='disconnect_files')
+
+    def test_process_info_starting(self):
+        """File sync status starting update the label."""
+        self.assert_status_correct(status_bd=backend.FILE_SYNC_STARTING,
+                                   status_ui=qt.FILE_SYNC_STARTING,
+                                   action=qt.FILE_SYNC_STOP,
+                                   callback='stop_files')
+
+    def test_process_info_stopped(self):
+        """File sync status stopped update the label."""
+        self.assert_status_correct(status_bd=backend.FILE_SYNC_STOPPED,
+                                   status_ui=qt.FILE_SYNC_STOPPED,
+                                   action=qt.FILE_SYNC_START,
+                                   callback='start_files')
+
+    def test_process_info_syncing(self):
+        """File sync status syncing update the label."""
+        self.assert_status_correct(status_bd=backend.FILE_SYNC_SYNCING,
+                                   status_ui=qt.FILE_SYNC_SYNCING,
+                                   action=qt.FILE_SYNC_DISCONNECT,
+                                   callback='disconnect_files')
+
+    def test_process_info_unknown(self):
+        """File sync status unknown update the label."""
+        msg = qt.WARNING_MARKUP % qt.FILE_SYNC_ERROR
+        self.assert_status_correct(status_bd=backend.FILE_SYNC_UNKNOWN,
+                                   status_ui=msg,
+                                   action=qt.FILE_SYNC_RESTART,
+                                   callback='restart_files')
+
+    def test_backend(self):
+        """Backend is created."""
+        self.assertIsInstance(self.ui.backend,
+                              backend.ControlBackend)
+
+    def test_refresh_status_requested(self):
+        """test refresh_status was requested on initialized."""
+        data = {}
+
+        def callback(status):
+            """Fake _process_status callback."""
+            data['called'] = True
+            data['status'] = status
+
+        self.patch(self.ui, "_process_status", callback)
+        self.ui.refresh_status()
+        self.assert_backend_called('file_sync_status')
+        self.assertTrue(data['called'])
+        self.assertEqual(data['status'], [])
+
+>>>>>>> MERGE-SOURCE
     def test_quit(self):
         """Test the quit option in the menu."""
         # Not done on setup, because if I patch stop
@@ -249,13 +404,58 @@
         tray.delete_window()
         self.assertEqual(tray.window, None)
 
+    def test_open_u1_folder_action(self):
+        """Test open_u1_folder_action."""
+        self.ui.open_u1_folder.trigger()
+        self.assertEqual(FakeDesktopService.data['cls'], FakeDesktopService)
+        expected_url = QtCore.QUrl(u'file://%s' % ROOT_PATH)
+        self.assertEqual(FakeDesktopService.data['url'], expected_url)
+
+    def test_get_more_storage_action(self):
+        """Test get_more_storage."""
+        self.ui.get_more_storage.trigger()
+        self.assertEqual(FakeDesktopService.data['cls'], FakeDesktopService)
+        expected_url = QtCore.QUrl(systray.GET_STORAGE_LINK)
+        self.assertEqual(FakeDesktopService.data['url'], expected_url)
+
+    def test_go_to_web_action(self):
+        """Test go_to_web."""
+        self.ui.go_to_web.trigger()
+        self.assertEqual(FakeDesktopService.data['cls'], FakeDesktopService)
+        expected_url = QtCore.QUrl(systray.DASHBOARD)
+        self.assertEqual(FakeDesktopService.data['url'], expected_url)
+
+    def test_get_help_action(self):
+        """Test get_help_online."""
+        self.ui.get_help_online.trigger()
+        self.assertEqual(FakeDesktopService.data['cls'], FakeDesktopService)
+        expected_url = QtCore.QUrl(systray.GET_SUPPORT_LINK)
+        self.assertEqual(FakeDesktopService.data['url'], expected_url)
+
     def test_initialization(self):
         """Test that everything initializes correctly."""
         tray = systray.TrayIcon()
         self.assertTrue(tray.isVisible())
         self.assertEqual(tray.window, None)
+        self.assertNotEqual(tray.icon(), None)
+        self.assertEqual(tray.uploading, {})
+        self.assertEqual(tray.recent_transfers, {})
         self.assertIsInstance(tray.context_menu, QtGui.QMenu)
+<<<<<<< TREE
         self.assertIsInstance(tray.status, QtGui.QAction)
         self.assertIsInstance(tray.status_action, QtGui.QAction)
         self.assertIsInstance(tray.open_u1, QtGui.QAction)
         self.assertNotEqual(tray.icon(), None)
+=======
+        self.assertIsInstance(tray.status, QtGui.QAction)
+        self.assertIsInstance(tray.status_action, QtGui.QAction)
+        self.assertIsInstance(tray.open_u1, QtGui.QAction)
+        self.assertIsInstance(tray.open_u1_folder, QtGui.QAction)
+        self.assertIsInstance(tray.go_to_web, QtGui.QAction)
+        self.assertIsInstance(tray.get_more_storage, QtGui.QAction)
+        self.assertIsInstance(tray.get_help_online, QtGui.QAction)
+        # This checks that _get_volumes_info and _process_volumes_info
+        # is being called correctly on initialization.
+        expected_home = u'file://%s' % ROOT_PATH
+        self.assertEqual(tray.root_path, expected_home)
+>>>>>>> MERGE-SOURCE