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

[Natalia Bidart]

[ Natalia B. Bidart <email address hidden> ]
  - Install all QT packages (LP: #905354).
  - List as python package 'utils' (LP: #898810).
  - Fixed typo on login screen (LP: #890410).

[ Diego Sarmentero <email address hidden> ]
  - Fixed: On the devices tab in u1cp, the icons are misaligned (LP: #856362).
  - Fixed QT UI folder view explore button (LP: #822698).

[ Manuel de la Pena <email address hidden> ]
  - Moved auto-update code from the u1-windows-installer to the control panel.
  - Changed the import from ubuntuone-dev-tools so that we do not use the
    deprecated API.

All green in ubuntu, and windows (tested windows 7).

IRL tested on Ubuntu.

[Roberto Alsina (ralsina)]

Looks good, (light) IRL on Windows

review: Approve

=== added file 'data/qt/device_remote.ui'
--- data/qt/device_remote.ui	1970-01-01 00:00:00 +0000
+++ data/qt/device_remote.ui	2011-12-19 21:16:23 +0000
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Form</class>
+ <widget class="QWidget" name="Form">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>264</width>
+    <height>45</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string notr="true">Form</string>
+  </property>
+  <layout class="QHBoxLayout" name="horizontalLayout">
+   <item>
+    <widget class="QLabel" name="device_icon_label">
+     <property name="pixmap">
+      <pixmap resource="images.qrc">:/computer.png</pixmap>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLabel" name="device_name_label">
+     <property name="text">
+      <string>Local device</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <spacer name="horizontalSpacer">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>217</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
+ </widget>
+ <resources>
+  <include location="images.qrc"/>
+ </resources>
+ <connections/>
+</ui>

=== modified file 'data/qt/ubuntuone.qss'
--- data/qt/ubuntuone.qss	2011-09-23 15:05:27 +0000
+++ data/qt/ubuntuone.qss	2011-12-19 21:16:23 +0000
@@ -126,11 +126,18 @@
 }
 
 QPushButton#explore_folder_button {
-    border: none;
-    background: none;
+    background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
+        stop: 0 #fbfbfb, stop: 1.0 #e6e6e6);
+    height: 15px;
+    border-radius: 7px;
+    border-color: #908e8d;
     color: #595959;
     padding-left: 10px;
     padding-right: 10px;
+    margin-top: 5px;
+    margin-bottom: 5px;
+    margin-right: 20px;
+    margin-left: 20px;
 }
 
 QPushButton#twitter_button,

=== modified file 'run-tests'
--- run-tests	2011-10-05 18:17:47 +0000
+++ run-tests	2011-12-19 21:16:23 +0000
@@ -18,6 +18,7 @@
 
 QT_TESTS_PATH=ubuntuone/controlpanel/gui/qt/tests
 GTK_TESTS_PATH=ubuntuone/controlpanel/gui/gtk/tests
+WINDOWS_TESTS=test_windows.py
 
 set -e
 
@@ -50,9 +51,9 @@
 ./setup.py build
 echo "Running test suite for ""$MODULE"
 if [ "$USE_QT" -eq 0 ]; then
-    `which xvfb-run` u1trial --ignore-paths $QT_TESTS_PATH "$MODULE"
+    `which xvfb-run` u1trial --ignore-paths "$QT_TESTS_PATH" -i "$WINDOWS_TESTS" "$MODULE"
 else
-    `which xvfb-run` u1trial --ignore-paths $GTK_TESTS_PATH --reactor=qt4 --gui "$MODULE"
+    `which xvfb-run` u1trial --ignore-paths "$GTK_TESTS_PATH" -i "$WINDOWS_TESTS" --reactor=qt4 --gui "$MODULE"
 fi
 style_check
 rm -rf _trial_temp

=== modified file 'run-tests.bat'
--- run-tests.bat	2011-10-06 20:38:39 +0000
+++ run-tests.bat	2011-12-19 21:16:23 +0000
@@ -20,12 +20,13 @@
 
 SET MODULE="ubuntuone"
 SET PYTHONEXEPATH="C:\Python27"
-SET IGNORE_PATHS="ubuntuone\controlpanel\gui\gtk, ubuntuone\controlpanel\dbustests, ubuntuone\controlpanel\web_client\tests\test_libsoup.py"
+SET IGNORE_PATHS="ubuntuone\controlpanel\gui\gtk, ubuntuone\controlpanel\dbustests"
+SET IGNORE_MODULES="test_linux.py, test_libsoup.py"
 
 "%PYTHONEXEPATH%\python.exe" setup.py build
 ECHO Running tests
 :: execute the tests with a number of ignored linux only modules
-"%PYTHONEXEPATH%\python.exe" "%PYTHONEXEPATH%\Scripts\u1trial" --reactor=qt4 --gui -p %IGNORE_PATHS% %MODULE%
+"%PYTHONEXEPATH%\python.exe" "%PYTHONEXEPATH%\Scripts\u1trial" --reactor=qt4 --gui -p %IGNORE_PATHS% -i %IGNORE_MODULES% %MODULE%
 :: Clean the build from the setupt.py
 ECHO Cleaning the generated code before running the style checks...
 "%PYTHONEXEPATH%\python.exe" setup.py clean

=== modified file 'setup.py'
--- setup.py	2011-12-01 19:27:00 +0000
+++ setup.py	2011-12-19 21:16:23 +0000
@@ -229,18 +229,23 @@
 
 DistUtilsExtra.auto.setup(
     name='ubuntuone-control-panel',
-    version='2.99',
+    version='2.99.0',
     license='GPL v3',
     author='Natalia Bidart',
     author_email='[e-mail]',
     description='Ubuntu One Control Panel',
-    long_description='Application to manage an Ubuntu One account. Provides' \
-        ' a DBus service to query/modify all the Ubuntu One bits.',
+    long_description='Application to manage an Ubuntu One account.',
     url='https://launchpad.net/ubuntuone-control-panel',
     packages=[
-        'ubuntuone', 'ubuntuone.controlpanel', 'ubuntuone.controlpanel.gui',
-        'ubuntuone.controlpanel.gui.gtk', 'ubuntuone.controlpanel.gui.qt',
+        'ubuntuone',
+        'ubuntuone.controlpanel',
+        'ubuntuone.controlpanel.gui',
+        'ubuntuone.controlpanel.gui.gtk',
+        'ubuntuone.controlpanel.gui.qt',
+        'ubuntuone.controlpanel.gui.qt.main',
+        'ubuntuone.controlpanel.gui.qt.ui',
         'ubuntuone.controlpanel.sd_client',
+        'ubuntuone.controlpanel.utils',
         'ubuntuone.controlpanel.web_client',
     ],
     extra_path='ubuntuone-control-panel',

=== modified file 'ubuntuone/controlpanel/dbustests/__init__.py'
--- ubuntuone/controlpanel/dbustests/__init__.py	2011-10-24 21:48:27 +0000
+++ ubuntuone/controlpanel/dbustests/__init__.py	2011-12-19 21:16:23 +0000
@@ -23,7 +23,7 @@
 
 from twisted.internet import defer
 
-from ubuntuone.devtools.testcase import DBusTestCase as TestCase
+from ubuntuone.devtools.testcases.dbus import DBusTestCase as TestCase
 
 from ubuntuone.controlpanel import dbus_service
 

=== modified file 'ubuntuone/controlpanel/dbustests/test_gui_service.py'
--- ubuntuone/controlpanel/dbustests/test_gui_service.py	2011-10-24 21:48:27 +0000
+++ ubuntuone/controlpanel/dbustests/test_gui_service.py	2011-12-19 21:16:23 +0000
@@ -27,7 +27,7 @@
 from twisted.internet import defer
 
 from ubuntuone.controlpanel.gui.gtk import gui
-from ubuntuone.devtools.testcase import DBusTestCase
+from ubuntuone.devtools.testcases.dbus import DBusTestCase
 from twisted.trial.unittest import TestCase
 
 

=== modified file 'ubuntuone/controlpanel/gui/gtk/tests/test_gui_basic.py'
--- ubuntuone/controlpanel/gui/gtk/tests/test_gui_basic.py	2011-10-24 21:48:27 +0000
+++ ubuntuone/controlpanel/gui/gtk/tests/test_gui_basic.py	2011-12-19 21:16:23 +0000
@@ -30,7 +30,7 @@
 )
 from ubuntuone.controlpanel.tests import TOKEN
 
-from ubuntuone.devtools.testcase import skipIf
+from ubuntuone.devtools.testcases import skipIf
 
 # Attribute 'yyy' defined outside __init__, access to a protected member
 # pylint: disable=W0201, W0212

=== modified file 'ubuntuone/controlpanel/gui/qt/device.py'
--- ubuntuone/controlpanel/gui/qt/device.py	2011-09-07 16:56:39 +0000
+++ ubuntuone/controlpanel/gui/qt/device.py	2011-12-19 21:16:23 +0000
@@ -29,10 +29,9 @@
 from ubuntuone.controlpanel.gui import DEVICE_CONFIRM_REMOVE
 from ubuntuone.controlpanel.gui.qt import (
     handle_errors,
-    icon_from_name,
     pixmap_from_name,
 )
-from ubuntuone.controlpanel.gui.qt.ui import device_ui
+from ubuntuone.controlpanel.gui.qt.ui import device_ui, device_remote_ui
 from ubuntuone.controlpanel.logger import setup_logging
 
 COMPUTER_ICON = "computer"
@@ -94,10 +93,27 @@
             self.removeCanceled.emit()
 
 
+class DeviceRemoteWidget(QtGui.QWidget):
+
+    """Remote Device widget for Devices List."""
+
+    def __init__(self, device_info):
+        super(DeviceRemoteWidget, self).__init__()
+        self.ui = device_remote_ui.Ui_Form()
+        self.ui.setupUi(self)
+
+        text = device_info["name"]
+        icon_name = icon_name_from_type(device_info["type"])
+        pixmap = pixmap_from_name(icon_name)
+        self.ui.device_icon_label.setPixmap(pixmap)
+        self.ui.device_name_label.setText(text)
+
+    def text(self):
+        """Return the text displayed in the Widget."""
+        return self.ui.device_name_label.text()
+
+
 def get_device_for_list_widget(device_info):
-    """Return a QListWidgetItem representing a device with the proper info."""
-    text = device_info["name"]
-    icon_name = icon_name_from_type(device_info["type"])
-    icon = icon_from_name(icon_name)
-    item = QtGui.QListWidgetItem(icon, text)
+    """Return a DeviceRemoteWidget with device proper info."""
+    item = DeviceRemoteWidget(device_info)
     return item

=== modified file 'ubuntuone/controlpanel/gui/qt/devices.py'
--- ubuntuone/controlpanel/gui/qt/devices.py	2011-09-07 16:56:39 +0000
+++ ubuntuone/controlpanel/gui/qt/devices.py	2011-12-19 21:16:23 +0000
@@ -99,5 +99,8 @@
 
     def create_remote_device(self, device_info):
         """Add a remote device to the list."""
-        item = device.get_device_for_list_widget(device_info)
+        widget = device.get_device_for_list_widget(device_info)
+        item = QtGui.QListWidgetItem()
+
         self.ui.list_devices.addItem(item)
+        self.ui.list_devices.setItemWidget(item, widget)

=== modified file 'ubuntuone/controlpanel/gui/qt/folders.py'
--- ubuntuone/controlpanel/gui/qt/folders.py	2011-09-12 15:00:24 +0000
+++ ubuntuone/controlpanel/gui/qt/folders.py	2011-12-19 21:16:23 +0000
@@ -175,10 +175,6 @@
                 model_index = self.ui.folders.indexFromItem(child, EXPLORE_COL)
                 button = QtGui.QPushButton(parent=self.ui.folders)
                 button.setFlat(True)
-                icon = icon_from_name(FOLDER_ICON_NAME)
-                button.icon_obj = icon  # hack!
-                button.setIcon(icon_from_name(FOLDER_ICON_NAME))
-                button.setIconSize(QtCore.QSize(12, 12))
                 button.setText(EXPLORE)
                 button.setObjectName('explore_folder_button')
                 policy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed,

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_devices.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_devices.py	2011-09-01 21:19:27 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_devices.py	2011-12-19 21:16:23 +0000
@@ -84,7 +84,8 @@
         self.assertEqual(self.ui.ui.list_devices.count(),
                          len(remote))
         for i, remote_device in enumerate(remote):
-            device = self.ui.ui.list_devices.item(i)
+            item = self.ui.ui.list_devices.item(i)
+            device = self.ui.ui.list_devices.itemWidget(item)
             self.assertEqual(device.text(), remote_device['name'])
 
     def test_process_info_twice(self):

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_folders.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_folders.py	2011-09-12 15:00:24 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_folders.py	2011-12-19 21:16:23 +0000
@@ -171,10 +171,6 @@
                 model_index = folders.indexFromItem(item, gui.EXPLORE_COL)
                 button = folders.indexWidget(model_index)
                 self.assertEqual(button.isFlat(), True)
-                self.assertEqual(button.icon_obj.icon_name,
-                                 gui.FOLDER_ICON_NAME)
-                self.assertEqual(button.iconSize().width(), 12)
-                self.assertEqual(button.iconSize().height(), 12)
                 self.assertEqual(button.isEnabled(),
                                  bool(volume['subscribed']))
 

=== modified file 'ubuntuone/controlpanel/tests/__init__.py'
--- ubuntuone/controlpanel/tests/__init__.py	2011-10-24 21:48:27 +0000
+++ ubuntuone/controlpanel/tests/__init__.py	2011-12-19 21:16:23 +0000
@@ -23,7 +23,7 @@
 
 from twisted.internet import defer
 
-from ubuntuone.devtools.testcase import TestCase as BaseTestCase
+from ubuntuone.devtools.testcases import TestCase as BaseTestCase
 
 from ubuntuone.controlpanel.backend import (
     DEVICE_TYPE_COMPUTER, DEVICE_TYPE_PHONE,

=== modified file 'ubuntuone/controlpanel/tests/test_sd_client.py'
--- ubuntuone/controlpanel/tests/test_sd_client.py	2011-10-24 21:48:27 +0000
+++ ubuntuone/controlpanel/tests/test_sd_client.py	2011-12-19 21:16:23 +0000
@@ -24,7 +24,7 @@
 
 from twisted.internet import defer
 from twisted.internet.defer import inlineCallbacks, returnValue
-from ubuntuone.devtools.testcase import skipIfNotOS
+from ubuntuone.devtools.testcases import skipIfNotOS
 # No name 'tools' in module 'ubuntuone.platform'
 # pylint: disable=E0611
 from ubuntuone.platform import tools

=== added directory 'ubuntuone/controlpanel/utils'
=== renamed file 'ubuntuone/controlpanel/utils.py' => 'ubuntuone/controlpanel/utils/__init__.py'
--- ubuntuone/controlpanel/utils.py	2011-06-29 18:10:16 +0000
+++ ubuntuone/controlpanel/utils/__init__.py	2011-12-19 21:16:23 +0000
@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 
-# Authors: Natalia B Bidart <[e-mail]>
 #
 # Copyright 2010 Canonical Ltd.
 #
@@ -19,6 +18,7 @@
 """Miscellaneous utilities."""
 
 import os
+import sys
 
 from ubuntuone.controlpanel.logger import setup_logging
 
@@ -30,6 +30,19 @@
 ERROR_TYPE = 'error_type'
 ERROR_MESSAGE = 'error_msg'
 
+# ignore issues with the name of the method
+# pylint: disable=C0103
+
+# import the platform dependent code.
+if sys.platform == 'win32':
+    from ubuntuone.controlpanel.utils import windows
+    are_updates_present = windows.are_updates_present
+    perform_update = windows.perform_update
+else:
+    are_updates_present = lambda *args, **kwargs: False
+    perform_update = lambda *args, **kwargs: None
+# pylint: enable=C0103
+
 
 def get_project_dir():
     """Return the absolute path to this project's data/ dir.
@@ -38,7 +51,8 @@
     """
     module = os.path.dirname(__file__)
     result = os.path.abspath(os.path.join(module, os.path.pardir,
-                                          os.path.pardir, DATA_SUFFIX))
+                                          os.path.pardir, os.path.pardir,
+                                          DATA_SUFFIX))
     logger.debug('get_project_dir: trying use data dir at %r (exists? %s)',
                   result, os.path.exists(result))
     if os.path.exists(result):

=== added directory 'ubuntuone/controlpanel/utils/tests'
=== added file 'ubuntuone/controlpanel/utils/tests/__init__.py'
--- ubuntuone/controlpanel/utils/tests/__init__.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/controlpanel/utils/tests/__init__.py	2011-12-19 21:16:23 +0000
@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+
+#
+# Copyright 2010 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/>.
+
+"""Test utils."""

=== added file 'ubuntuone/controlpanel/utils/tests/test_linux.py'
--- ubuntuone/controlpanel/utils/tests/test_linux.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/controlpanel/utils/tests/test_linux.py	2011-12-19 21:16:23 +0000
@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+
+#
+# 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/>.
+
+"""Test the linux utils functions."""
+
+
+from twisted.internet import defer
+
+from ubuntuone.controlpanel import utils
+from ubuntuone.controlpanel.tests import TestCase
+
+
+class AutoupdaterTestCase(TestCase):
+    """Test the code that is used for the auto update process."""
+
+    @defer.inlineCallbacks
+    def test_are_updates_present(self):
+        """We should never have updates."""
+        are_present = yield utils.are_updates_present(None)
+        self.assertFalse(are_present)
+
+    def test_perform_update(self):
+        """Test the method that performs the update."""
+        self.assertEqual(None, utils.perform_update())

=== renamed file 'ubuntuone/controlpanel/tests/test_utils.py' => 'ubuntuone/controlpanel/utils/tests/test_utils.py'
--- ubuntuone/controlpanel/tests/test_utils.py	2011-10-24 21:48:27 +0000
+++ ubuntuone/controlpanel/utils/tests/test_utils.py	2011-12-19 21:16:23 +0000
@@ -73,7 +73,9 @@
         """The relative path for the data directory is correctly retrieved."""
         module = utils.os.path.dirname(utils.__file__)
         rel_data = utils.os.path.join(module, utils.os.path.pardir,
-                                      utils.os.path.pardir, utils.DATA_SUFFIX)
+                                      utils.os.path.pardir,
+                                      utils.os.path.pardir,
+                                      utils.DATA_SUFFIX)
         expected_dir = utils.os.path.abspath(rel_data)
 
         # ensure expected_path exists at os level

=== added file 'ubuntuone/controlpanel/utils/tests/test_windows.py'
--- ubuntuone/controlpanel/utils/tests/test_windows.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/controlpanel/utils/tests/test_windows.py	2011-12-19 21:16:23 +0000
@@ -0,0 +1,179 @@
+# -*- coding: utf-8 -*-
+
+#
+# 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/>.
+
+"""Test the windows utils functions."""
+
+import os
+
+from twisted.internet import defer
+
+from ubuntuone.controlpanel import utils
+from ubuntuone.controlpanel.tests import TestCase
+
+# let me use protected methods
+# pylint: disable=W0212
+
+
+class AutoupdaterTestCase(TestCase):
+    """Test the code that is used for the auto update process."""
+
+    @defer.inlineCallbacks
+    def setUp(self):
+        """Prepare for the diff tests."""
+        yield super(AutoupdaterTestCase, self).setUp()
+        self.auto_update_path = r'path\to\exe'
+        self.return_from_call = 0
+        self.command = None
+        self.args = []
+
+        def fake_execute_process(command, args=None, path=None):
+            """Fake async process execution."""
+            self.command = command
+            self.args = args
+            return self.return_from_call
+
+        self.patch(utils.windows, 'getProcessValue', fake_execute_process)
+        self.patch(utils.windows, '_get_update_path',
+                   lambda: self.auto_update_path)
+
+    @defer.inlineCallbacks
+    def test_are_updates_present_true(self):
+        """Test when updates are present."""
+        # the idea is simple, set the value to be returned from
+        # the fake call, assert that we get true and also that
+        # we did use the correct parameters.
+        self.return_from_call = 0
+        are_present = yield utils.are_updates_present()
+        self.assertTrue(are_present, 'Updates should be present.')
+        # lets assert that we did use the correct args
+        expected_args = ('--mode', 'unattended')
+        self.assertEqual(expected_args, self.args)
+        self.assertEqual(self.command, self.auto_update_path)
+
+    @defer.inlineCallbacks
+    def test_are_updates_present_false(self):
+        """Test when updates are not present."""
+        # similar to test_are_updates_present_true but with diff retcode
+        self.return_from_call = 40
+        are_present = yield utils.are_updates_present()
+        self.assertFalse(are_present, 'Updates should NOT be present.')
+        # lets assert that we did use the correct args
+        expected_args = ('--mode', 'unattended')
+        self.assertEqual(expected_args, self.args)
+        self.assertEqual(self.command, self.auto_update_path)
+
+    def test_perform_update(self):
+        """Test the method that performs the update."""
+        self.patch(utils.windows.win32api, 'ShellExecute', self._set_called)
+        utils.perform_update()
+        self.assertIn(self.auto_update_path, self._called[0][2])
+        self.assertEqual('runas', self._called[0][1])
+        self.assertEqual('--unattendedmodeui none', self._called[0][3])
+        self.assertEqual('', self._called[0][4])
+        self.assertEqual(0, self._called[0][5])
+
+
+class GetPathTestCase(TestCase):
+    """Test the code that is used for the auto update process."""
+
+    @defer.inlineCallbacks
+    def setUp(self):
+        """Set the different tests."""
+        yield super(GetPathTestCase, self).setUp()
+        self.called = []
+        self.exec_path = 'path/to/current/exe'
+        self.exists = True
+
+        def fake_abspath(path):
+            """Fake os.path.abspath."""
+            self.called.append('os.path.abspath')
+            return path
+
+        def fake_dirname(path):
+            """Fake os.path.dirname."""
+            self.called.append('os.path.dirname')
+            return path
+
+        def fake_exists(path):
+            """Fake os.path.exists."""
+            self.called.append('os.path.exists')
+            return self.exists
+
+        # patch the os.path functions used
+        self.patch(utils.windows.os.path, 'abspath', fake_abspath)
+        self.patch(utils.windows.os.path, 'dirname', fake_dirname)
+        self.patch(utils.windows.os.path, 'exists', fake_exists)
+
+    def _delete_frozen_state(self):
+        """Delete the frozen state."""
+        del utils.windows.sys.frozen
+        del utils.windows.sys.executable
+
+    def test_get_auto_update_path_frozen(self):
+        """Test the method used to get the autoupdate."""
+        # patch the diff parts of sys so that we get fake paths
+        is_frozen = hasattr(utils.windows.sys, 'frozen')
+        if not is_frozen:
+            utils.windows.sys.frozen = True
+            utils.windows.sys.executable = self.exec_path
+            self.addCleanup(self._delete_frozen_state)
+
+        # called method and assert that we have the correct result
+        path = utils.windows._get_update_path()
+        self.assertEqual(os.path.join(self.exec_path,
+                         utils.windows.AUTOUPDATE_EXE_NAME), path)
+        self.assertTrue('os.path.abspath' in self.called)
+        self.assertTrue('os.path.dirname' in self.called)
+        self.assertTrue('os.path.exists' in self.called)
+
+    def _reset_frozen_state(self, old_frozen, old_exec_path):
+        """Reset the frozen state."""
+        utils.windows.sys.frozen = old_frozen
+        utils.windows.sys.executable = old_exec_path
+
+    def _reset__file__(self, path):
+        """Reset the value of __file__."""
+        utils.windows.__file__ = path
+
+    def test_get_auto_update_path_not_frozen(self):
+        """Test the method used to get the autoupdate."""
+        is_frozen = hasattr(utils.windows.sys, 'frozen')
+        if is_frozen:
+            old_frozen = utils.windows.sys.frozen
+            old_exec_path = utils.windows.sys.executable
+            del utils.windows.sys.frozen
+            del utils.windows.sys.executable
+            self.addCleanup(self._reset_frozen_state, old_frozen,
+                            old_exec_path)
+        # set a fake __file__ for the module
+        old_file = utils.windows.__file__
+        utils.windows.__file__ = self.exec_path
+        self.addCleanup(self._reset__file__, old_file)
+
+        path = utils.windows._get_update_path()
+        self.assertEqual(os.path.join(self.exec_path,
+                         utils.windows.AUTOUPDATE_EXE_NAME), path)
+        self.assertEqual(2, self.called.count('os.path.dirname'))
+        self.assertTrue('os.path.exists' in self.called)
+
+    def test_get_auto_update_path_not_present(self):
+        """Test the method used to get the autoupdate."""
+        self.exists = False
+
+        # called method and assert that we have the correct result
+        path = utils.windows._get_update_path()
+        self.assertEqual(None, path)

=== added file 'ubuntuone/controlpanel/utils/windows.py'
--- ubuntuone/controlpanel/utils/windows.py	1970-01-01 00:00:00 +0000
+++ ubuntuone/controlpanel/utils/windows.py	2011-12-19 21:16:23 +0000
@@ -0,0 +1,73 @@
+# -*- coding: utf-8 -*-
+
+#
+# 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/>.
+
+"""Autoupdate functions for windows."""
+
+import os
+import sys
+
+# Avoid pylint error on Linux
+# pylint: disable=F0401
+import win32api
+# pylint: enable=F0401
+
+from twisted.internet import defer
+from twisted.internet.utils import getProcessValue
+
+from ubuntuone.controlpanel.logger import setup_logging
+
+logger = setup_logging('utils')
+AUTOUPDATE_EXE_NAME = 'autoupdate-windows.exe'
+
+
+def _get_update_path():
+    """Return the path in which the autoupdate command is found."""
+    if hasattr(sys, 'frozen'):
+        exec_path = os.path.abspath(sys.executable)
+    else:
+        exec_path = os.path.dirname(__file__)
+    folder = os.path.dirname(exec_path)
+    update_path = os.path.join(folder, AUTOUPDATE_EXE_NAME)
+    if os.path.exists(update_path):
+        return update_path
+    return None
+
+
[e-mail]
+def are_updates_present():
+    """Return if there are updates for Ubuntu One."""
+    result = False
+    retcode = None
+    update_path = _get_update_path()
+    if update_path is not None:
+        # If there is an update present we will get 0, non-zero otherwise
+        retcode = yield getProcessValue(update_path, args=('--mode',
+            'unattended'), path=os.path.dirname(update_path))
+        result = retcode == 0
+    logger.debug('are_updates_present: update path: %r, return code: %r,'
+                 ' result: %r', update_path, retcode, result)
+    defer.returnValue(result)
+
+
+def perform_update():
+    """Spawn the autoupdate process and call the stop function."""
+    update_path = _get_update_path()
+    if update_path is not None:
+        # lets call the updater with the commands that are required,
+        win32api.ShellExecute(None, 'runas',
+            update_path,
+            '--unattendedmodeui none', '', 0)

=== modified file 'ubuntuone/controlpanel/web_client/tests/test_txwebclient.py'
--- ubuntuone/controlpanel/web_client/tests/test_txwebclient.py	2011-10-24 21:48:27 +0000
+++ ubuntuone/controlpanel/web_client/tests/test_txwebclient.py	2011-12-19 21:16:23 +0000
@@ -24,7 +24,7 @@
 from twisted.internet import defer, reactor
 from twisted.internet.defer import inlineCallbacks
 from twisted.web import server, resource
-from ubuntuone.devtools.testcase import skipIfOS
+from ubuntuone.devtools.testcases import skipIfOS
 
 from ubuntuone.controlpanel.web_client import txwebclient
 from ubuntuone.controlpanel.tests import TestCase