Merge lp:~nataliabidart/ubuntuone-control-panel/use-webclient into lp:ubuntuone-control-panel

[Natalia Bidart]

 - Replaced custom webclient with the one from ubuntu-sso-client
   (LP: #926311).
- Removed the dependency on qt4reactor for Linux implementation.

[Roberto Alsina (ralsina)]

Looks good to me....

review: Approve

[Natalia Bidart (nataliabidart)]

The controlpanel, in order to run on windows, will need:

https://code.launchpad.net/~nataliabidart/ubuntu-sso-client/delay-reactor-import/+merge/91712

[Alejandro J. Cura (alecu)]

Code looks nice, all tests pass, tested IRL on linux.

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~nataliabidart/ubuntuone-control-panel/use-webclient into lp:ubuntuone-control-panel failed. Below is the output from the failed tests.

*** Running test suite for ubuntuone/controlpanel ***

Traceback (most recent call last):
  File "/usr/bin/u1trial", line 325, in <module>
    main()
  File "/usr/bin/u1trial", line 305, in main
    suite = trial_runner.get_suite(config)
  File "/usr/bin/u1trial", line 184, in get_suite
    config['ignore-paths']))
  File "/usr/bin/u1trial", line 168, in _collect_tests
    module_suite = self._load_unittest(filepath)
  File "/usr/bin/u1trial", line 108, in _load_unittest
    module = __import__(modpath, None, None, [""])
  File "/home/tarmac/cache/ubuntuone-control-panel/trunk/ubuntuone/controlpanel/tests/test_web_client.py", line 24, in <module>
    from ubuntu_sso.utils.webclient.tests import BaseMockWebServer
ImportError: No module named tests

=== modified file 'setup.py'
--- setup.py	2012-01-26 13:31:22 +0000
+++ setup.py	2012-02-07 14:03:19 +0000
@@ -247,7 +247,6 @@
         'ubuntuone.controlpanel.gui.qt.ui',
         'ubuntuone.controlpanel.sd_client',
         'ubuntuone.controlpanel.utils',
-        'ubuntuone.controlpanel.web_client',
     ],
     extra_path='ubuntuone-control-panel',
     data_files=[

=== modified file 'ubuntuone/controlpanel/backend.py'
--- ubuntuone/controlpanel/backend.py	2012-01-25 14:49:59 +0000
+++ ubuntuone/controlpanel/backend.py	2012-02-07 14:03:19 +0000
@@ -34,41 +34,47 @@
 
 from ubuntuone.controlpanel import sd_client, replication_client
 from ubuntuone.controlpanel.logger import setup_logging, log_call
-# pylint: disable=W0611
-from ubuntuone.controlpanel.web_client import (UnauthorizedError,
-    web_client_factory, WebClientError)
-# pylint: enable=W0611
+from ubuntuone.controlpanel.web_client import (
+    UnauthorizedError,
+    WebClient,
+    WebClientError,
+)
 
 logger = setup_logging('backend')
 
-ACCOUNT_API = "account/"
-QUOTA_API = "quota/"
-DEVICES_API = "1.0/devices/"
-DEVICE_REMOVE_API = "1.0/devices/remove/%s/%s"
-DEVICE_TYPE_PHONE = "Phone"
-DEVICE_TYPE_COMPUTER = "Computer"
-AUTOCONNECT_KEY = 'autoconnect'
-SHOW_ALL_NOTIFICATIONS_KEY = 'show_all_notifications'
-SHARE_AUTOSUBSCRIBE_KEY = 'share_autosubscribe'
-UDF_AUTOSUBSCRIBE_KEY = 'udf_autosubscribe'
-LIMIT_BW_KEY = 'limit_bandwidth'
-UPLOAD_KEY = "max_upload_speed"
-DOWNLOAD_KEY = "max_download_speed"
-
-FILE_SYNC_DISABLED = 'file-sync-disabled'
-FILE_SYNC_DISCONNECTED = 'file-sync-disconnected'
-FILE_SYNC_ERROR = 'file-sync-error'
-FILE_SYNC_IDLE = 'file-sync-idle'
-FILE_SYNC_STARTING = 'file-sync-starting'
-FILE_SYNC_STOPPED = 'file-sync-stopped'
-FILE_SYNC_SYNCING = 'file-sync-syncing'
-FILE_SYNC_UNKNOWN = 'file-sync-unknown'
+ACCOUNT_API = u"account/"
+DEVICES_API = u"1.0/devices/"
+DEVICE_REMOVE_API = u"1.0/devices/remove/%s/%s"
+QUOTA_API = u"quota/"
+
+DEVICE_TYPE_PHONE = u"Phone"
+DEVICE_TYPE_COMPUTER = u"Computer"
+
+AUTOCONNECT_KEY = u'autoconnect'
+SHOW_ALL_NOTIFICATIONS_KEY = u'show_all_notifications'
+SHARE_AUTOSUBSCRIBE_KEY = u'share_autosubscribe'
+UDF_AUTOSUBSCRIBE_KEY = u'udf_autosubscribe'
+LIMIT_BW_KEY = u'limit_bandwidth'
+UPLOAD_KEY = u'max_upload_speed'
+DOWNLOAD_KEY = u'max_download_speed'
+
+FILE_SYNC_DISABLED = u'file-sync-disabled'
+FILE_SYNC_DISCONNECTED = u'file-sync-disconnected'
+FILE_SYNC_ERROR = u'file-sync-error'
+FILE_SYNC_IDLE = u'file-sync-idle'
+FILE_SYNC_STARTING = u'file-sync-starting'
+FILE_SYNC_STOPPED = u'file-sync-stopped'
+FILE_SYNC_SYNCING = u'file-sync-syncing'
+FILE_SYNC_UNKNOWN = u'file-sync-unknown'
 
 MSG_KEY = 'message'
 STATUS_KEY = 'status'
 
 CONTACTS_PKG = 'thunderbird-couchdb'
 
+UBUNTUONE_FROM_OAUTH = u'https://one.ubuntu.com/api/1.0/from_oauth/'
+UBUNTUONE_LINK = u'https://one.ubuntu.com/'
+
 
 def append_path_sep(path):
     """If 'path' does not end with the path separator, append it."""
@@ -135,7 +141,7 @@
 
         self.login_client = CredentialsManagementTool()
         self.sd_client = sd_client.SyncDaemonClient()
-        self.wc = web_client_factory(self.get_credentials)
+        self.wc = WebClient(self.get_credentials)
 
         logger.info('ControlBackend: instance started.')
 
@@ -304,6 +310,19 @@
         returnValue(path)
 
     @inlineCallbacks
+    def build_signed_iri(self, iri):
+        """Returned an OAuth signed iri."""
+        credentials = None
+        if iri.startswith(UBUNTUONE_LINK):
+            credentials = yield self.get_credentials()
+
+        if credentials:
+            parameters = {'next': iri}
+            iri = yield self.wc.build_signed_iri(UBUNTUONE_FROM_OAUTH,
+                                                 parameters)
+        returnValue(iri)
+
+    @inlineCallbacks
     def get_credentials(self):
         """Find credentials."""
         if not self._credentials:

=== modified file 'ubuntuone/controlpanel/gui/__init__.py'
--- ubuntuone/controlpanel/gui/__init__.py	2011-10-06 20:38:39 +0000
+++ ubuntuone/controlpanel/gui/__init__.py	2012-02-07 14:03:19 +0000
@@ -21,56 +21,55 @@
 
 import gettext
 
-from oauth import oauth
+from ubuntuone.controlpanel.backend import UBUNTUONE_LINK
+
 
 _ = gettext.gettext
 
 
-ERROR_COLOR = 'red'
+ERROR_COLOR = u'red'
 KILOBYTES = 1024
 NO_OP = lambda *a, **kw: None
 # http://design.canonical.com/the-toolkit/ubuntu-logo-and-circle-of-friends/
-ORANGE = '#DD4814'
+ORANGE = u'#DD4814'
 QUOTA_THRESHOLD = 0.95
 SHARES_MIN_SIZE_FULL = 1048576
-SUCCESS_COLOR = 'green'
+SUCCESS_COLOR = u'green'
 
 ERROR_ICON = u'✘'
 SYNCING_ICON = u'⇅'
 IDLE_ICON = u'✔'
 
-CONTACT_ICON_NAME = 'avatar-default'
-FOLDER_ICON_NAME = 'folder'
-SHARE_ICON_NAME = 'folder-remote'
-MUSIC_ICON_NAME = 'audio-x-generic'
-
-CONTACTS_ICON = 'contacts.png'
-FACEBOOK_LOGO = 'facebook.png'
-FILES_ICON = 'files.png'
-OVERVIEW_BANNER = 'overview.png'
-TWITTER_LOGO = 'twitter.png'
-MUSIC_STORE_ICON = 'music-store.png'
-MUSIC_STREAM_ICON = 'music-stream.png'
-NOTES_ICON = 'notes.png'
-SERVICES_CONTACTS_ICON = 'services-contacts.png'
-SERVICES_FILES_EXAMPLE = 'services-files-example.png'
-SERVICES_FILES_ICON = 'services-files.png'
-
-FILE_URI_PREFIX = 'file://'
-UBUNTUONE_FROM_OAUTH = 'https://one.ubuntu.com/api/1.0/from_oauth/'
-UBUNTUONE_LINK = 'https://one.ubuntu.com/'
+CONTACT_ICON_NAME = u'avatar-default'
+FOLDER_ICON_NAME = u'folder'
+SHARE_ICON_NAME = u'folder-remote'
+MUSIC_ICON_NAME = u'audio-x-generic'
+
+CONTACTS_ICON = u'contacts.png'
+FACEBOOK_LOGO = u'facebook.png'
+FILES_ICON = u'files.png'
+OVERVIEW_BANNER = u'overview.png'
+TWITTER_LOGO = u'twitter.png'
+MUSIC_STORE_ICON = u'music-store.png'
+MUSIC_STREAM_ICON = u'music-stream.png'
+NOTES_ICON = u'notes.png'
+SERVICES_CONTACTS_ICON = u'services-contacts.png'
+SERVICES_FILES_EXAMPLE = u'services-files-example.png'
+SERVICES_FILES_ICON = u'services-files.png'
+
+FILE_URI_PREFIX = u'file://'
 
 CONTACTS_LINK = UBUNTUONE_LINK
-EDIT_ACCOUNT_LINK = UBUNTUONE_LINK + 'account/'
-EDIT_DEVICES_LINK = EDIT_ACCOUNT_LINK + 'machines/'
-EDIT_PROFILE_LINK = 'https://login.ubuntu.com/'
-EDIT_SERVICES_LINK = UBUNTUONE_LINK + 'services'
-FACEBOOK_LINK = 'http://www.facebook.com/ubuntuone/'
-GET_SUPPORT_LINK = UBUNTUONE_LINK + 'support/'
+EDIT_ACCOUNT_LINK = UBUNTUONE_LINK + u'account/'
+EDIT_DEVICES_LINK = EDIT_ACCOUNT_LINK + u'machines/'
+EDIT_PROFILE_LINK = u'https://login.ubuntu.com/'
+EDIT_SERVICES_LINK = UBUNTUONE_LINK + u'services'
+FACEBOOK_LINK = u'http://www.facebook.com/ubuntuone/'
+GET_SUPPORT_LINK = UBUNTUONE_LINK + u'support/'
 LEARN_MORE_LINK = UBUNTUONE_LINK
-MANAGE_FILES_LINK = UBUNTUONE_LINK + 'files/'
-RESET_PASSWORD_LINK = EDIT_PROFILE_LINK + '+forgot_password'
-TWITTER_LINK = 'http://twitter.com/ubuntuone/'
+MANAGE_FILES_LINK = UBUNTUONE_LINK + u'files/'
+RESET_PASSWORD_LINK = EDIT_PROFILE_LINK + u'+forgot_password'
+TWITTER_LINK = u'http://twitter.com/ubuntuone/'
 
 ALWAYS_SUBSCRIBED = _('Always in sync')
 CONNECT_BUTTON_LABEL = _('Connect to Ubuntu One')
@@ -86,7 +85,7 @@
                         'previous values were restored.')
 DEVICE_CONFIRM_REMOVE = _('Are you sure you want to remove this device '
                           'from Ubuntu One?')
-DEVICE_REMOVABLE_PREFIX = 'Ubuntu One @ '
+DEVICE_REMOVABLE_PREFIX = u'Ubuntu One @ '
 DEVICE_REMOVAL_ERROR = _('The device could not be removed.')
 DEVICES_BUTTON_TOOLTIP = _('Manage devices registered with your personal '
                            'cloud')
@@ -185,19 +184,3 @@
     str_bytes = str_bytes.rstrip('0')
     str_bytes = str_bytes.rstrip('.')
     return '%s %s' % (str_bytes, units[unit])
-
-
-def sign_url(url, credentials, timestamp=None):
-    """Sign the URL using the currently available credentials."""
-    consumer = oauth.OAuthConsumer(credentials["consumer_key"],
-                                   credentials["consumer_secret"])
-    token = oauth.OAuthToken(credentials["token"],
-                             credentials["token_secret"])
-    parameters = {'next': url, 'oauth_timestamp': timestamp}
-    request = oauth.OAuthRequest.from_consumer_and_token(
-        http_url=UBUNTUONE_FROM_OAUTH, http_method='GET',
-        oauth_consumer=consumer, token=token,
-        parameters=parameters)
-    sig_method = oauth.OAuthSignatureMethod_HMAC_SHA1()
-    request.sign_request(sig_method, consumer, token)
-    return request.to_url()

=== modified file 'ubuntuone/controlpanel/gui/qt/folders.py'
--- ubuntuone/controlpanel/gui/qt/folders.py	2012-01-18 17:40:33 +0000
+++ ubuntuone/controlpanel/gui/qt/folders.py	2012-02-07 14:03:19 +0000
@@ -1,8 +1,6 @@
 # -*- coding: utf-8 -*-
-
-# Authors: Alejandro J. Cura <[e-mail]>
 #
-# Copyright 2011 Canonical Ltd.
+# Copyright 2011-2012 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
@@ -85,10 +83,7 @@
     def on_folder_created(self, new_folder):
         """Reload folder info after folder creation."""
         self.is_processing = True
-        # hack to ensure that syncdaemon updates the folder list.
-        # pylint: disable=W0404, E1101
-        from twisted.internet import reactor
-        reactor.callLater(2, self.load)
+        self.load()
 
     # pylint: disable=E0202
     @defer.inlineCallbacks

=== modified file 'ubuntuone/controlpanel/gui/qt/gotoweb.py'
--- ubuntuone/controlpanel/gui/qt/gotoweb.py	2011-10-05 23:12:23 +0000
+++ ubuntuone/controlpanel/gui/qt/gotoweb.py	2012-02-07 14:03:19 +0000
@@ -23,8 +23,7 @@
 from twisted.internet import defer
 
 from ubuntuone.controlpanel import cache
-from ubuntuone.controlpanel.gui import qt, sign_url, UBUNTUONE_LINK
-from ubuntuone.controlpanel.web_client.txwebclient import timestamp_checker
+from ubuntuone.controlpanel.gui import qt
 
 
 class GoToWebButton(cache.Cache, QtGui.QPushButton):
@@ -44,14 +43,5 @@
     def on_clicked(self):
         """Open self.uri if not None, do nothing otherwise."""
         if self.uri is not None:
-
-            credentials = None
-            if self.uri.startswith(UBUNTUONE_LINK):
-                credentials = yield self.backend.get_credentials()
-
-            uri = self.uri
-            if credentials:
-                timestamp = yield timestamp_checker.get_faithful_time()
-                uri = yield sign_url(uri, credentials, timestamp)
-
+            uri = yield self.backend.build_signed_iri(self.uri)
             qt.uri_hook(uri)

=== modified file 'ubuntuone/controlpanel/gui/qt/gui.py'
--- ubuntuone/controlpanel/gui/qt/gui.py	2011-09-15 14:42:24 +0000
+++ ubuntuone/controlpanel/gui/qt/gui.py	2012-02-07 14:03:19 +0000
@@ -52,20 +52,20 @@
     # pylint: enable=C0103
 
 
-def start(stop, minimized=False, with_icon=False):
+def start(close_callback, minimized=False, with_icon=False):
     """Show the UI elements."""
     # pylint: disable=W0404, F0401
     if not minimized:
         if with_icon or minimized:
             window = MainWindow()
         else:
-            window = MainWindow(close_callback=stop)
+            window = MainWindow(close_callback=close_callback)
         window.show()
     else:
         window = None
     if with_icon or minimized:
         QtGui.QApplication.instance().setQuitOnLastWindowClosed(False)
-        icon = TrayIcon(window=window)
+        icon = TrayIcon(window=window, close_callback=close_callback)
     else:
         icon = None
     return icon, window

=== modified file 'ubuntuone/controlpanel/gui/qt/main/__init__.py'
--- ubuntuone/controlpanel/gui/qt/main/__init__.py	2012-01-19 19:00:54 +0000
+++ ubuntuone/controlpanel/gui/qt/main/__init__.py	2012-02-07 14:03:19 +0000
@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-"""Provide the correct reactor and ui integration."""
+"""Provide the correct ui main module."""
 
 import sys
 
@@ -37,32 +37,23 @@
 
 
 def main(switch_to='', alert=False, minimized=False, with_icon=False):
-    """Start the Qt reactor and open the main window."""
+    """Start the Qt mainloop and open the main window."""
     # The following cannot be imported outside this function
     # because u1trial already provides a reactor.
 
-    # The main loop MUST be initialized before importing the reactor
     app = UniqueApplication(sys.argv, "ubuntuone-control-panel")
     source.main(app)
+
     qss = QtCore.QResource(":/ubuntuone.qss")
     app.setStyleSheet(qss.data())
 
-    # Reimport 'qt4reactor', 'reactor', 'start', pylint: disable=W0404, F0401
-    import qt4reactor
-    qt4reactor.install()
-
-    from twisted.internet import reactor
     from ubuntuone.controlpanel.gui.qt.gui import start
-    # pylint: enable=W0404, F0401
-
-    # Module 'reactor' has no 'run'/'stop' member, pylint: disable=E1101
 
     # Unused variable 'window', 'icon', pylint: disable=W0612
-    icon, window = start(reactor.stop,
+    icon, window = start(lambda: source.main_quit(app),
                          minimized=minimized, with_icon=with_icon)
     # pylint: enable=W0612
     if icon:
         app.new_instance.connect(icon.restore_window)
 
-    reactor.run()
-    # pylint: enable=E1101
+    source.main_start(app)

=== modified file 'ubuntuone/controlpanel/gui/qt/main/linux.py'
--- ubuntuone/controlpanel/gui/qt/main/linux.py	2012-01-26 12:41:08 +0000
+++ ubuntuone/controlpanel/gui/qt/main/linux.py	2012-02-07 14:03:19 +0000
@@ -16,10 +16,18 @@
 
 """Main method to be used on linux."""
 
-from dbus.mainloop.qt import DBusQtMainLoop
-
 
 def main(app):
     """Apply style sheet."""
-    # The DBus main loop MUST be initialized before importing the reactor
+    from dbus.mainloop.qt import DBusQtMainLoop
     DBusQtMainLoop(set_as_default=True)
+
+
+def main_start(app):
+    """Start the mainloop."""
+    app.exec_()
+
+
+def main_quit(app):
+    """Stop the mainloop."""
+    app.exit()

=== modified file 'ubuntuone/controlpanel/gui/qt/main/windows.py'
--- ubuntuone/controlpanel/gui/qt/main/windows.py	2012-01-26 12:41:08 +0000
+++ ubuntuone/controlpanel/gui/qt/main/windows.py	2012-02-07 14:03:19 +0000
@@ -24,3 +24,24 @@
     # Apply font to the entire application
     QtGui.QFontDatabase.addApplicationFont(':/Ubuntu-R.ttf')
     QtGui.QFontDatabase.addApplicationFont(':/Ubuntu-B.ttf')
+
+    import qt4reactor
+    qt4reactor.install()
+
+
+# Module 'reactor' has no 'run'/'stop' member, pylint: disable=E1101
+
+
+def main_start(app):
+    """Start the mainloop."""
+    from twisted.internet import reactor
+    reactor.run()
+
+
+def main_quit(app):
+    """Stop the mainloop."""
+    from twisted.internet import reactor
+    reactor.stop()
+
+
+# pylint: enable=E1101

=== modified file 'ubuntuone/controlpanel/gui/qt/systray.py'
--- ubuntuone/controlpanel/gui/qt/systray.py	2011-12-27 13:54:49 +0000
+++ ubuntuone/controlpanel/gui/qt/systray.py	2012-02-07 14:03:19 +0000
@@ -25,7 +25,7 @@
 
     """System notification icon."""
 
-    def __init__(self, window=None):
+    def __init__(self, window=None, close_callback=lambda: None):
         super(TrayIcon, self).__init__(None)
         self.setIcon(QtGui.QIcon(":/u1icon.png"))
         self.setVisible(True)
@@ -41,6 +41,8 @@
         self.context_menu.addAction(self.quit)
         self.setContextMenu(self.context_menu)
 
+        self.close_callback = close_callback
+
     def on_activated(self, reason):
         """The user activated the icon."""
         if reason == self.Trigger:  # Left-click
@@ -73,7 +75,4 @@
         except:
             # Maybe it was not running?
             pass
-        # pylint: disable=W0404
-        from twisted.internet import reactor
-        # pylint: enable=W0404
-        reactor.stop()
+        self.close_callback()

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/__init__.py'
--- ubuntuone/controlpanel/gui/qt/tests/__init__.py	2012-01-18 19:52:25 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/__init__.py	2012-02-07 14:03:19 +0000
@@ -20,7 +20,6 @@
 
 import logging
 import os
-import urllib
 
 from PyQt4 import QtGui, QtCore
 from twisted.internet import defer
@@ -28,8 +27,7 @@
 
 from ubuntuone.controlpanel import backend, cache
 from ubuntuone.controlpanel.tests import TestCase, EXPECTED_ACCOUNT_INFO, TOKEN
-from ubuntuone.controlpanel.gui import qt, UBUNTUONE_FROM_OAUTH
-from ubuntuone.controlpanel.gui.qt import gotoweb
+from ubuntuone.controlpanel.gui import qt
 from ubuntuone.controlpanel.gui.tests import FakedObject, USER_HOME
 
 # Attribute 'yyy' defined outside __init__, access to a protected member
@@ -107,19 +105,31 @@
 
     next_result = []
     exposed_methods = [
-        'account_info',  # account
-        'devices_info', 'device_names_info',  # devices
-        'change_device_settings', 'remove_device',
-        'volumes_info', 'change_volume_settings',  # volumes
-        'create_folder', 'validate_path_for_folder',
-        'replications_info', 'change_replication_settings',  # replications
-        'file_sync_status', 'enable_files', 'disable_files',  # files
-        'connect_files', 'disconnect_files',
-        'restart_files', 'start_files', 'stop_files',
+        'account_info',
+        'build_signed_iri',
+        'change_device_settings',
+        'change_file_sync_settings',
+        'change_replication_settings',
+        'change_volume_settings',
+        'connect_files',
+        'create_folder',
+        'device_names_info',
+        'devices_info',
+        'disable_files',
+        'disconnect_files',
+        'enable_files',
         'file_sync_settings_info',
-        'change_file_sync_settings',
+        'file_sync_status',
+        'login',
+        'remove_device',
+        'replications_info',
+        'restart_files',
         'restore_file_sync_settings',
-        'shutdown', 'login',
+        'shutdown',
+        'start_files',
+        'stop_files',
+        'validate_path_for_folder',
+        'volumes_info',
     ]
 
     def get_credentials(self):
@@ -131,6 +141,9 @@
         """Fake home return."""
         return USER_HOME
 
+    def build_signed_iri(self, iri):
+        """Fake iri signing."""
+
 
 class CrashyBackendException(Exception):
     """A faked backend crash."""
@@ -284,19 +297,14 @@
 
     def assert_uri_hook_called(self, button, url):
         """Check that uri_hook was called with 'url' when clicking 'button'."""
-        fake_time = 12345678
+        self.patch(self.ui.backend, 'next_result', url)
         self.patch(qt, 'uri_hook', self._set_called)
-        self.patch(gotoweb.timestamp_checker, "get_faithful_time",
-                   lambda: defer.succeed(fake_time))
         button.click()
 
         self.assertEqual(len(self._called), 2, 'uri_hook must be called.')
         self.assertEqual(len(self._called[0]), 1, 'uri_hook must be called.')
         actual_url = self._called[0][0]
-        if actual_url.startswith(UBUNTUONE_FROM_OAUTH):
-            self.assertIn(urllib.urlencode({'next': url}), actual_url)
-        else:
-            self.assertEqual(actual_url, url)
+        self.assertEqual(actual_url, url)
 
     def test_init_loads_ui(self, expected_setup_ui=None):
         """The __init__ method loads the ui."""

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_gotoweb.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_gotoweb.py	2011-10-06 20:33:42 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_gotoweb.py	2012-02-07 14:03:19 +0000
@@ -20,7 +20,7 @@
 
 from twisted.internet import defer
 
-from ubuntuone.controlpanel.gui import qt, UBUNTUONE_LINK
+from ubuntuone.controlpanel.gui import qt
 from ubuntuone.controlpanel.gui.qt import gotoweb as gui
 from ubuntuone.controlpanel.gui.qt.tests import (
     BaseTestCase,
@@ -53,11 +53,14 @@
 
     def test_open_uri_when_clicked(self):
         """When clicking the button, the uri is opened."""
+        expected_iri = 'foo-bar-baz'
+        self.patch(self.ui.backend, 'build_signed_iri', lambda i: expected_iri)
         self.patch(qt, 'uri_hook', self._set_called)
         self.ui.uri = 'yadda-yadda-yoo'
+
         self.ui.click()
 
-        self.assertEqual(self._called, ((self.ui.uri,), {}))
+        self.assertEqual(self._called, ((expected_iri,), {}))
 
     def test_do_nothing_on_clicked_if_uri_is_none(self):
         """When clicking the button, if the uri is None, do nothing."""
@@ -66,53 +69,3 @@
         self.ui.click()
 
         self.assertEqual(self._called, False)
-
-
-class SignUrlTestCase(GoToWebButtonTestCase):
-    """The test suite for the sign url management."""
-
-    @defer.inlineCallbacks
-    def setUp(self):
-        yield super(SignUrlTestCase, self).setUp()
-        self.patch(qt, 'uri_hook', lambda url: None)
-        self.patch(gui, 'sign_url', self._set_called)
-        self.creds = yield self.ui.backend.get_credentials()
-        assert len(self.creds) > 0
-
-    def test_without_ubuntuone_prefix(self):
-        """If given url is not an ubuntuone url, don't sign it."""
-        self.ui.uri = 'bad_prefix' + UBUNTUONE_LINK
-        self.ui.click()
-
-        self.assertFalse(self._called)
-
-    def test_with_ubuntuone_prefix(self):
-        """If given url is an ubuntuone url, sign it."""
-        fake_time = 12345
-        self.ui.uri = UBUNTUONE_LINK + 'foo'
-        self.patch(gui.timestamp_checker, "get_faithful_time",
-                   lambda: defer.succeed(fake_time))
-        self.ui.click()
-
-        expected_call = ((self.ui.uri, self.creds, fake_time), {})
-        self.assertEqual(self._called, expected_call)
-
-
-class SignUrlNoCredsTestCase(SignUrlTestCase):
-    """The test suite for the sign url management when there are no creds."""
-
-    @defer.inlineCallbacks
-    def setUp(self):
-        yield super(SignUrlNoCredsTestCase, self).setUp()
-        self.patch(self.ui.backend, 'get_credentials', lambda: {})
-
-    def test_with_ubuntuone_prefix(self):
-        """If given url is an ubuntuone url, don't sign it.
-
-        Since we have no credentials, the url should not be signed.
-
-        """
-        self.ui.uri = UBUNTUONE_LINK + 'foo'
-        self.ui.click()
-
-        self.assertFalse(self._called)

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_signin.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_signin.py	2011-09-07 17:56:17 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_signin.py	2012-02-07 14:03:19 +0000
@@ -20,7 +20,6 @@
 
 from twisted.internet import defer
 
-from ubuntuone.controlpanel.gui import qt
 from ubuntuone.controlpanel.gui.qt import signin as gui
 from ubuntuone.controlpanel.gui.qt.tests import (
     CrashyBackend,
@@ -107,10 +106,8 @@
 
     def test_forgot_password_button(self):
         """When clicking the forgot passsword btn, the proper url is opened."""
-        self.patch(qt, 'uri_hook', self._set_called)
-        self.ui.ui.forgot_password_button.click()
-
-        self.assertEqual(self._called, ((gui.RESET_PASSWORD_LINK,), {}))
+        self.assert_uri_hook_called(self.ui.ui.forgot_password_button,
+                                    gui.RESET_PASSWORD_LINK)
 
 
 class SignInButtonPanelTestCase(BaseSignInPanelTestCase):

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_start.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_start.py	2011-09-15 15:37:04 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_start.py	2012-02-07 14:03:19 +0000
@@ -1,91 +1,89 @@
-# -*- 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 start function."""
-
-from twisted.internet import defer
-
-from ubuntuone.controlpanel.gui.qt import gui
-from ubuntuone.controlpanel.gui.qt.tests import NO_OP
-from ubuntuone.controlpanel.tests import TestCase
-
-
-class FakeThing(object):
-
-    """A fake thing."""
-
-    def __init__(self):
-        self.args = []
-        self.shown = False
-
-    def __call__(self, *args, **kwargs):
-        self.args.append((args, kwargs))
-        return self
-
-    def show(self):
-        """Show."""
-        self.shown = True
-
-
-class FakeReactor(object):
-    """A fake reactor."""
-
-    def run(self):
-        """Start."""
-
-    def stop(self):
-        """Stop."""
-
-
-class StartTestCase(TestCase):
-    """Test the qt control panel."""
-
-    @defer.inlineCallbacks
-    def setUp(self):
-        yield super(StartTestCase, self).setUp()
-        self.main_window = FakeThing()
-        self.tray_icon = FakeThing()
-        self.patch(gui, "MainWindow", self.main_window)
-        self.patch(gui, "TrayIcon", self.tray_icon)
-
-    def test_minimized(self):
-        """Test behaviour with minimized=True."""
-        gui.start(NO_OP, minimized=True, with_icon=True)
-        self.assertEqual(self.tray_icon.args, [((), {'window': None})])
-        self.assertEqual(self.main_window.args, [])
-
-    def test_with_icon(self):
-        """Test behaviour with with_icon=True."""
-        gui.start(NO_OP, with_icon=True, minimized=False)
-        self.assertEqual(self.main_window.args, [((), {})])
-        self.assertEqual(self.tray_icon.args, [((),
-            {'window': self.main_window})])
-
-    def test_both_false(self):
-        """Test behaviour when with_icon and minimized are False."""
-        gui.start(NO_OP, with_icon=False, minimized=False)
-        # Should be called
-        self.assertNotEqual(self.main_window.args, [])
-        # Should not be called
-        self.assertEqual(self.tray_icon.args, [])
-
-    def test_both_true(self):
-        """Test behaviour when with_icon and minimized are True."""
-        gui.start(NO_OP, with_icon=True, minimized=True)
-        self.assertEqual(self.tray_icon.args, [((), {'window': None})])
-        self.assertEqual(self.main_window.args, [])
+# -*- 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 start function."""
+
+from twisted.internet import defer
+
+from ubuntuone.controlpanel.gui.qt import gui
+from ubuntuone.controlpanel.tests import TestCase
+
+
+class FakeThing(object):
+
+    """A fake thing."""
+
+    def __init__(self):
+        self.args = []
+        self.shown = False
+
+    def __call__(self, *args, **kwargs):
+        self.args.append((args, kwargs))
+        return self
+
+    def show(self):
+        """Show."""
+        self.shown = True
+
+
+class StartTestCase(TestCase):
+    """Test the qt control panel."""
+
+    @defer.inlineCallbacks
+    def setUp(self):
+        yield super(StartTestCase, self).setUp()
+        self.main_window = FakeThing()
+        self.tray_icon = FakeThing()
+        self.patch(gui, "MainWindow", self.main_window)
+        self.patch(gui, "TrayIcon", self.tray_icon)
+
+    def close_cb(self):
+        """A dummy close callback."""
+
+    def test_minimized(self):
+        """Test behaviour with minimized=True."""
+        gui.start(close_callback=self.close_cb,
+                  minimized=True, with_icon=True)
+        kwargs = {'close_callback': self.close_cb, 'window': None}
+        self.assertEqual(self.tray_icon.args, [((), kwargs)])
+        self.assertEqual(self.main_window.args, [])
+
+    def test_with_icon(self):
+        """Test behaviour with with_icon=True."""
+        gui.start(close_callback=self.close_cb,
+                  with_icon=True, minimized=False)
+        kwargs = {'close_callback': self.close_cb, 'window': self.main_window}
+        self.assertEqual(self.main_window.args, [((), {})])
+        self.assertEqual(self.tray_icon.args, [((), kwargs)])
+
+    def test_both_false(self):
+        """Test behaviour when with_icon and minimized are False."""
+        gui.start(close_callback=self.close_cb,
+                  with_icon=False, minimized=False)
+        # Should be called
+        self.assertNotEqual(self.main_window.args, [])
+        # Should not be called
+        self.assertEqual(self.tray_icon.args, [])
+
+    def test_both_true(self):
+        """Test behaviour when with_icon and minimized are True."""
+        gui.start(close_callback=self.close_cb,
+                  with_icon=True, minimized=True)
+        kwargs = {'close_callback': self.close_cb, 'window': None}
+        self.assertEqual(self.tray_icon.args, [((), kwargs)])
+        self.assertEqual(self.main_window.args, [])

=== modified file 'ubuntuone/controlpanel/gui/qt/tests/test_systray.py'
--- ubuntuone/controlpanel/gui/qt/tests/test_systray.py	2012-01-02 19:38:14 +0000
+++ ubuntuone/controlpanel/gui/qt/tests/test_systray.py	2012-02-07 14:03:19 +0000
@@ -19,7 +19,6 @@
 """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
@@ -65,7 +64,6 @@
         """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)

=== removed file 'ubuntuone/controlpanel/gui/tests/test_url_sign.py'
--- ubuntuone/controlpanel/gui/tests/test_url_sign.py	2011-10-05 23:12:23 +0000
+++ ubuntuone/controlpanel/gui/tests/test_url_sign.py	1970-01-01 00:00:00 +0000
@@ -1,102 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Authors: Roberto Alsina <[e-mail]>
-# Authors: Alejandro J. Cura <[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 url signing function."""
-
-from urlparse import urlparse, parse_qs
-
-from ubuntuone.controlpanel.tests import TestCase
-from ubuntuone.controlpanel.gui import (
-    sign_url,
-    UBUNTUONE_FROM_OAUTH,
-)
-
-TOKEN = {u'consumer_key': u'consumer_key',
-         u'consumer_secret': u'consumer_secret',
-         u'token_name': u'test_token',
-         u'token': u'GkInOfSMGwTXAUoVQwLUoPxElEEUdhsLVNTPhxHJDUIeHCPNEo',
-         u'token_secret': u'qFYImEtlczPbsCnYyuwLoPDlPEnvNcIktZphPQklAWrvyfFMV'}
-
-SAMPLE_SIGNED = UBUNTUONE_FROM_OAUTH + '?oauth_nonce=' \
-    '36886134&oauth_timestamp=1310671062&oauth_consumer_key=consumer_key&' \
-    'oauth_signature_method=HMAC-SHA1&next=%2Fblah&oauth_version=1.0&' \
-    'oauth_token=GkInOfSMGwTXAUoVQwLUoPxElEEUdhsLVNTPhxHJDUIeHCPNEo&' \
-    'oauth_signature=s6h0LRBiWchTADrTJWaJUSuaGpo%3D'
-
-#pylint: disable=E1101
-
-
-class SignURLTestCase(TestCase):
-
-    """Test cases for the URL signing function."""
-
-    def test_is_correct_domain(self):
-        """Test that we are using the right domain."""
-        signed = sign_url("/blah", TOKEN)
-        parsed_signed = urlparse(signed)
-        parsed_sample = urlparse(SAMPLE_SIGNED)
-        self.assertEqual(parsed_signed.netloc, parsed_sample.netloc)
-
-    def test_is_correct_path(self):
-        """Test that we are using the right path in the URL."""
-        signed = sign_url("/blah", TOKEN)
-        parsed_signed = urlparse(signed)
-        parsed_sample = urlparse(SAMPLE_SIGNED)
-        self.assertEqual(parsed_signed.path, parsed_sample.path)
-
-    def test_is_correct_scheme(self):
-        """Test that we are using the right scheme."""
-        signed = sign_url("/blah", TOKEN)
-        parsed_signed = urlparse(signed)
-        parsed_sample = urlparse(SAMPLE_SIGNED)
-
-        self.assertEqual(parsed_signed.scheme, parsed_sample.scheme)
-
-    def test_correct_query(self):
-        """Test the invariant parts of the signed URL."""
-        signed = sign_url("/blah", TOKEN)
-        parsed_signed = urlparse(signed)
-        parsed_sample = urlparse(SAMPLE_SIGNED)
-        signed_query = parse_qs(parsed_signed.query)
-        sample_query = parse_qs(parsed_sample.query)
-
-        for key in ('next',
-            'oauth_consumer_key',
-            'oauth_signature_method',
-            'oauth_token',
-            'oauth_version'):
-            self.assertEqual("%s=%s" % (key, signed_query[key]),
-            "%s=%s" % (key, sample_query[key]))
-
-    def test_url_with_query(self):
-        """Test that we are using the right scheme."""
-        signed = sign_url("/blah?foo=bar", TOKEN)
-        parsed_signed = urlparse(signed)
-        signed_query = parse_qs(parsed_signed.query)
-
-        self.assertEqual(signed_query['next'], ['/blah?foo=bar'])
-
-    def test_uses_timestamper(self):
-        """Test that the signed url is using the server-relative timestamp."""
-        timestamp = 999
-        signed = sign_url("/blah?foo=bar", TOKEN, timestamp)
-        parsed_signed = urlparse(signed)
-        signed_query = parse_qs(parsed_signed.query)
-
-        self.assertEqual(signed_query['oauth_timestamp'], [str(timestamp)])

=== modified file 'ubuntuone/controlpanel/tests/test_backend.py'
--- ubuntuone/controlpanel/tests/test_backend.py	2012-01-26 12:44:10 +0000
+++ ubuntuone/controlpanel/tests/test_backend.py	2012-02-07 14:03:19 +0000
@@ -43,6 +43,8 @@
     FILE_SYNC_SYNCING,
     FILE_SYNC_UNKNOWN,
     MSG_KEY, STATUS_KEY,
+    UBUNTUONE_FROM_OAUTH,
+    UBUNTUONE_LINK,
 )
 from ubuntuone.controlpanel.tests import (TestCase,
     EMPTY_DESCRIPTION_JSON,
@@ -65,6 +67,12 @@
     USER_HOME,
 )
 
+SAMPLE_SIGNED = UBUNTUONE_FROM_OAUTH + '?oauth_nonce=' \
+    '36886134&oauth_timestamp=1310671062&oauth_consumer_key=consumer_key&' \
+    'oauth_signature_method=HMAC-SHA1&next=%2Fblah&oauth_version=1.0&' \
+    'oauth_token=GkInOfSMGwTXAUoVQwLUoPxElEEUdhsLVNTPhxHJDUIeHCPNEo&' \
+    'oauth_signature=s6h0LRBiWchTADrTJWaJUSuaGpo%3D'
+
 
 # pylint: disable=E1101, W0201, W0212
 
@@ -104,6 +112,13 @@
             result = simplejson.loads(self.results[method])
             return defer.succeed(result)
 
+    @defer.inlineCallbacks
+    def build_signed_iri(self, iri, params):
+        """Fake the IRI signing."""
+        creds = yield self.get_credentials()
+        result = u'%s-%s-%s' % (iri, unicode(creds), unicode(params))
+        defer.returnValue(result)
+
 
 class MockLoginClient(CallRecorder):
     """A mock login_client module."""
@@ -347,7 +362,7 @@
     @defer.inlineCallbacks
     def setUp(self):
         yield super(BackendBasicTestCase, self).setUp()
-        self.patch(backend, "web_client_factory", MockWebClient)
+        self.patch(backend, "WebClient", MockWebClient)
         self.patch(backend, "CredentialsManagementTool", MockLoginClient)
         self.patch(backend.sd_client, "SyncDaemonClient", MockSDClient)
         self.patch(backend, "replication_client", MockReplicationClient())
@@ -368,12 +383,14 @@
     @inlineCallbacks
     def test_get_token(self):
         """The get_token method returns the right token."""
+        self.patch(self.be, 'get_credentials', lambda: defer.succeed(TOKEN))
         token = yield self.be.get_token()
         self.assertEqual(token, TOKEN["token"])
 
     @inlineCallbacks
     def test_device_is_local(self):
         """The device_is_local returns the right result."""
+        self.patch(self.be, 'get_credentials', lambda: defer.succeed(TOKEN))
         result = yield self.be.device_is_local(self.local_token)
         self.assertTrue(result)
 
@@ -408,6 +425,54 @@
         self.assertIs(self.be.sd_client, self.be.sd_client)
 
 
+class SignIriTestCase(BackendBasicTestCase):
+    """Test cases for the IRI signing function."""
+
+    @defer.inlineCallbacks
+    def setUp(self):
+        yield super(SignIriTestCase, self).setUp()
+        self.patch(self.be, 'get_credentials', lambda: defer.succeed(TOKEN))
+
+    @inlineCallbacks
+    def test_without_ubuntuone_prefix(self):
+        """If given url is not an ubuntuone url, don't sign it."""
+        iri = 'bad_prefix' + UBUNTUONE_LINK
+        result = yield self.be.build_signed_iri(iri)
+
+        self.assertEqual(result, iri)
+
+    @inlineCallbacks
+    def test_with_ubuntuone_prefix(self):
+        """If given url is an ubuntuone url, sign it."""
+        iri = UBUNTUONE_LINK + 'foo'
+        result = yield self.be.build_signed_iri(iri)
+
+        expected = yield self.be.wc.build_signed_iri(UBUNTUONE_FROM_OAUTH,
+                                                     {'next': iri})
+        self.assertEqual(expected, result)
+
+
+class SignIriNoCredsTestCase(SignIriTestCase):
+    """The test suite for the sign url management when there are no creds."""
+
+    @defer.inlineCallbacks
+    def setUp(self):
+        yield super(SignIriNoCredsTestCase, self).setUp()
+        self.patch(self.be, 'get_credentials', lambda: defer.succeed({}))
+
+    @inlineCallbacks
+    def test_with_ubuntuone_prefix(self):
+        """If given url is an ubuntuone url, don't sign it.
+
+        Since we have no credentials, the url should not be signed.
+
+        """
+        iri = UBUNTUONE_LINK + 'foo'
+        result = yield self.be.build_signed_iri(iri)
+
+        self.assertEqual(result, iri)
+
+
 class BackendCredentialsTestCase(BackendBasicTestCase):
     """Credentials tests for the backend."""
 

=== modified file 'ubuntuone/controlpanel/tests/test_web_client.py'
--- ubuntuone/controlpanel/tests/test_web_client.py	2011-10-07 14:36:14 +0000
+++ ubuntuone/controlpanel/tests/test_web_client.py	2012-02-07 14:03:19 +0000
@@ -1,9 +1,6 @@
 # -*- coding: utf-8 -*-
-
-# Authors: Alejandro J. Cura <[e-mail]>
-# Authors: Natalia B. Bidart <[e-mail]>
 #
-# Copyright 2010 Canonical Ltd.
+# Copyright 2011-2012 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
@@ -17,26 +14,38 @@
 # You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-"""Integration tests for the control panel backend webservice client."""
-
-from twisted.application import internet, service
+"""Integration tests for the webclient."""
+
+from urlparse import urlparse, parse_qs
+
 from twisted.internet import defer
-from twisted.internet.defer import inlineCallbacks
-from twisted.web import server, resource
-
-from ubuntuone.controlpanel import web_client
+from twisted.web import resource
+
+from ubuntu_sso.utils.webclient.tests import BaseMockWebServer
+
 from ubuntuone.controlpanel.tests import TestCase
+from ubuntuone.controlpanel.web_client import (
+    UnauthorizedError,
+    WebClient,
+    WebClientError,
+)
 
 
 SAMPLE_KEY = "result"
 SAMPLE_VALUE = "sample result"
 SAMPLE_RESOURCE = '{"%s": "%s"}' % (SAMPLE_KEY, SAMPLE_VALUE)
 SAMPLE_CREDENTIALS = dict(
-    consumer_key="consumer key",
-    consumer_secret="consumer secret",
-    token="the real token",
-    token_secret="the token secret",
+    consumer_key="consumer_key",
+    consumer_secret="consumer_secret",
+    token="the_real_token",
+    token_secret="the_token_secret",
 )
+SAMPLE_TARGET = u'http://example.com/'
+SAMPLE_SIGNED = SAMPLE_TARGET + u'?oauth_nonce=36886134&' \
+    'oauth_timestamp=1328544832&oauth_consumer_key=%s&' \
+    'oauth_signature_method=HMAC-SHA1&next=%%2Fblah&oauth_version=1.0&' \
+    'oauth_token=%s&oauth_signature=s6h0LRBiWchTADrTJWaJUSuaGpo3D' % \
+    (SAMPLE_CREDENTIALS['consumer_key'], SAMPLE_CREDENTIALS['token'])
 
 
 def sample_get_credentials():
@@ -63,11 +72,11 @@
         return self.contents
 
 
-class MockWebService(object):
-    """A mock webservice for testing"""
+class MockWebServer(BaseMockWebServer):
+    """A mock webserver for the webclient tests."""
 
-    def __init__(self):
-        """Start up this instance."""
+    def get_root_resource(self):
+        """Get the root resource with all the children."""
         root = resource.Resource()
         devices_resource = MockResource()
         devices_resource.contents = SAMPLE_RESOURCE
@@ -77,91 +86,105 @@
                                           "Unauthrorized", "Unauthrorized")
         root.putChild("unauthorized", unauthorized)
 
-        site = server.Site(root)
-        application = service.Application('web')
-        self.service_collection = service.IServiceCollection(application)
-        #pylint: disable=E1101
-        self.tcpserver = internet.TCPServer(0, site)
-        self.tcpserver.setServiceParent(self.service_collection)
-        self.service_collection.startService()
-
-    def get_url(self):
-        """Build the url for this mock server."""
-        #pylint: disable=W0212
-        port_num = self.tcpserver._port.getHost().port
-        return "http://localhost:%d/" % port_num
-
-    def stop(self):
-        """Shut it down."""
-        #pylint: disable=E1101
-        return self.service_collection.stopService()
+        return root
 
 
 class WebClientTestCase(TestCase):
     """Test for the webservice client."""
 
-    timeout = 8
+    timeout = 5
 
-    @inlineCallbacks
+    @defer.inlineCallbacks
     def setUp(self):
         yield super(WebClientTestCase, self).setUp()
-        self.ws = MockWebService()
-        test_base_url = self.ws.get_url()
-        self.wc = web_client.web_client_factory(sample_get_credentials,
-                                                test_base_url)
+        self.ws = MockWebServer()
+        self.addCleanup(self.ws.stop)
+        self.base_iri = self.ws.get_iri()
+
+        self.wc = WebClient(sample_get_credentials, base_url=self.base_iri)
         self.addCleanup(self.wc.shutdown)
-        self.addCleanup(self.ws.stop)
-        web_module = web_client.web_client_module()
-        if getattr(web_module, "timestamp_checker", None):
-            fake_timestamp = 12345678
-            self.patch(web_module.timestamp_checker, "get_faithful_time",
-                       lambda: defer.succeed(fake_timestamp))
 
-    @inlineCallbacks
+    @defer.inlineCallbacks
     def test_get_url(self):
         """A method is successfully called in the mock webservice."""
         result = yield self.wc.call_api("devices")
         self.assertIn(SAMPLE_KEY, result)
         self.assertEqual(SAMPLE_VALUE, result[SAMPLE_KEY])
 
-    @inlineCallbacks
+    @defer.inlineCallbacks
     def test_get_url_error(self):
         """The errback is called when there's some error."""
         yield self.assertFailure(self.wc.call_api("throwerror"),
-                                 web_client.WebClientError)
+                                 WebClientError)
 
-    @inlineCallbacks
+    @defer.inlineCallbacks
     def test_unauthorized(self):
         """Detect when a request failed with UNAUTHORIZED."""
         yield self.assertFailure(self.wc.call_api("unauthorized"),
-                                 web_client.UnauthorizedError)
-
-
-class OAuthTestCase(TestCase):
-    """Test for the oauth signing code."""
-
-    def test_build_oauth_headers(self):
-        """Build the oauth headers for a sample request."""
-
-        sample_method = "GET"
-        sample_url = "http://one.ubuntu.com/"
-        timestamp = 1
-        headers = web_client.build_oauth_headers(sample_method, sample_url,
-                                                 SAMPLE_CREDENTIALS, timestamp)
-        self.assertIn("Authorization", headers)
-
-    def test_add_oauth_headers(self):
-        """Add the OAuth headers to a request."""
-
-        def sample_build_headers(*a):
-            """Build some sample headers."""
-            return {"header1": "h1", "header2": "h2"}
-
-        self.patch(web_client, "build_oauth_headers", sample_build_headers)
-        test_request_headers = {}
-        append_method = test_request_headers.__setitem__
-        timestamp = 12345
-        web_client.add_oauth_headers(append_method, "GET", "http://this", {},
-                                     timestamp)
-        self.assertIn("header1", test_request_headers)
-        self.assertIn("header2", test_request_headers)
+                                 UnauthorizedError)
+
+
+class WebClientBuildSignedIriTestCase(WebClientTestCase):
+    """Test for the webservice client when signing iris."""
+
+    # Instance of 'ParseResult' has no 'foo' member
+    # pylint: disable=E1101
+
+    @defer.inlineCallbacks
+    def test_is_correct_domain(self):
+        """Test that we are using the right domain."""
+        signed = yield self.wc.build_signed_iri(SAMPLE_TARGET)
+        parsed_signed = urlparse(signed)
+        parsed_sample = urlparse(SAMPLE_SIGNED)
+        self.assertEqual(parsed_signed.netloc, parsed_sample.netloc)
+
+    @defer.inlineCallbacks
+    def test_is_correct_path(self):
+        """Test that we are using the right path in the URL."""
+        signed = yield self.wc.build_signed_iri(SAMPLE_TARGET)
+        parsed_signed = urlparse(signed)
+        parsed_sample = urlparse(SAMPLE_SIGNED)
+        self.assertEqual(parsed_signed.path, parsed_sample.path)
+
+    @defer.inlineCallbacks
+    def test_is_correct_scheme(self):
+        """Test that we are using the right scheme."""
+        signed = yield self.wc.build_signed_iri(SAMPLE_TARGET)
+        parsed_signed = urlparse(signed)
+        parsed_sample = urlparse(SAMPLE_SIGNED)
+
+        self.assertEqual(parsed_signed.scheme, parsed_sample.scheme)
+
+    @defer.inlineCallbacks
+    def test_correct_query(self):
+        """Test the invariant parts of the signed URL."""
+        signed = yield self.wc.build_signed_iri(SAMPLE_TARGET,
+                                                params={'next': u'/blah'})
+        parsed_signed = urlparse(signed)
+        parsed_sample = urlparse(SAMPLE_SIGNED)
+        signed_query = parse_qs(parsed_signed.query)
+        sample_query = parse_qs(parsed_sample.query)
+
+        for key in ('next', 'oauth_consumer_key', 'oauth_version',
+                    'oauth_signature_method', 'oauth_token'):
+            self.assertEqual(map(unicode, signed_query[key]),
+                             sample_query[key])
+
+    @defer.inlineCallbacks
+    def test_url_with_query(self):
+        """Test that we are using the right scheme."""
+        signed = yield self.wc.build_signed_iri(SAMPLE_TARGET,
+                                             params={'next': u'/blah?foo=bar'})
+        parsed_signed = urlparse(signed)
+        signed_query = parse_qs(parsed_signed.query)
+
+        self.assertEqual(signed_query['next'], [u'/blah?foo=bar'])
+
+    @defer.inlineCallbacks
+    def test_uses_timestamper(self):
+        """Test that the signed url is using the serverrelative timestamp."""
+        signed = yield self.wc.build_signed_iri(u'/blah?foo=bar')
+        parsed_signed = urlparse(signed)
+        signed_query = parse_qs(parsed_signed.query)
+
+        self.assertTrue(signed_query['oauth_timestamp'] is not None)

=== removed directory 'ubuntuone/controlpanel/web_client'
=== renamed file 'ubuntuone/controlpanel/web_client/__init__.py' => 'ubuntuone/controlpanel/web_client.py'
--- ubuntuone/controlpanel/web_client/__init__.py	2011-10-07 14:36:14 +0000
+++ ubuntuone/controlpanel/web_client.py	2012-02-07 14:03:19 +0000
@@ -1,9 +1,6 @@
 # -*- coding: utf-8 -*-
-
-# Authors: Natalia B Bidart <[e-mail]>
-#          Alejandro J. Cura <[e-mail]>
 #
-# Copyright 2011 Canonical Ltd.
+# Copyright 2011-2012 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
@@ -19,60 +16,55 @@
 
 """The web client."""
 
-from oauth import oauth
-
-
-# pylint: disable=W0401, W0614
-
-
-class WebClientError(Exception):
-    """An http error happened while calling the webservice."""
-
-
-class UnauthorizedError(WebClientError):
-    """The request ended with bad_request, unauthorized or forbidden."""
-
-
-def build_oauth_headers(method, url, credentials, timestamp):
-    """Build an oauth request given some credentials."""
-    consumer = oauth.OAuthConsumer(credentials["consumer_key"],
-                                   credentials["consumer_secret"])
-    token = oauth.OAuthToken(credentials["token"],
-                             credentials["token_secret"])
-    parameters = {}
-    if timestamp:
-        parameters["oauth_timestamp"] = timestamp
-    request = oauth.OAuthRequest.from_consumer_and_token(
-                                        http_url=url,
-                                        http_method=method,
-                                        parameters=parameters,
-                                        oauth_consumer=consumer,
-                                        token=token)
-    sig_method = oauth.OAuthSignatureMethod_HMAC_SHA1()
-    request.sign_request(sig_method, consumer, token)
-    return request.to_header()
-
-
-def add_oauth_headers(append_method, method, url, credentials, timestamp=None):
-    """Sign a libsoup message with oauth headers."""
-    headers = build_oauth_headers(method, url, credentials, timestamp)
-    for key, value in headers.items():
-        append_method(key, value)
-
-
-def web_client_module():
-    """Choose the module of the web client."""
-    # the reactor can only be imported after Qt is initialized
-    # pylint: disable=W0404
-    from twisted.internet import reactor
-    if getattr(reactor, "qApp", None):
-        from ubuntuone.controlpanel.web_client import txwebclient as web_module
-    else:
-        from ubuntuone.controlpanel.web_client import libsoup as web_module
-    return web_module
-
-
-def web_client_factory(*args, **kwargs):
-    """Choose the type of the web client dynamically."""
-    web_module = web_client_module()
-    return web_module.WebClient(*args, **kwargs)
+import simplejson
+
+from twisted.internet import defer
+# need to export the exceptions to avoid API breakage
+# pylint: disable=W0611
+from ubuntu_sso.utils.webclient import (
+    UnauthorizedError,
+    WebClientError,
+    webclient_factory,
+)
+# pylint: enable=W0611
+
+from ubuntuone.controlpanel import WEBSERVICE_BASE_URL
+from ubuntuone.controlpanel.logger import setup_logging
+
+
+logger = setup_logging('webclient')
+
+
+class WebClient(object):
+    """A client for the u1 webservice."""
+
+    def __init__(self, get_credentials, base_url=WEBSERVICE_BASE_URL):
+        """Initialize the webclient."""
+        self.base_url = base_url
+        self.get_credentials = get_credentials
+        self.wc = webclient_factory()
+        logger.debug("WebClient created: base_url is %r, inner client is %r.",
+                     self.base_url, self.wc)
+
+    @defer.inlineCallbacks
+    def call_api(self, api_name, extra_headers=None):
+        """Call the webservice."""
+        # this may log device ID's, but only for removals, which is OK
+        logger.debug("calling api: %r", api_name)
+        iri = self.base_url + api_name
+        credentials = yield self.get_credentials()
+        response = yield self.wc.request(iri, extra_headers=extra_headers,
+                                     oauth_credentials=credentials)
+        result = simplejson.loads(response.content)
+        defer.returnValue(result)
+
+    @defer.inlineCallbacks
+    def build_signed_iri(self, iri, params=None):
+        """Build an OAuth iri."""
+        credentials = yield self.get_credentials()
+        result = yield self.wc.build_signed_iri(iri, credentials, params)
+        defer.returnValue(result)
+
+    def shutdown(self):
+        """Shutdown and cleanup."""
+        return self.wc.shutdown()

=== removed file 'ubuntuone/controlpanel/web_client/libsoup.py'
--- ubuntuone/controlpanel/web_client/libsoup.py	2011-10-06 19:56:38 +0000
+++ ubuntuone/controlpanel/web_client/libsoup.py	1970-01-01 00:00:00 +0000
@@ -1,133 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Authors: Alejandro J. Cura <[e-mail]>
-# Authors: Natalia B. Bidart <[e-mail]>
-#
-# 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/>.
-
-"""The control panel backend webservice client."""
-
-import simplejson
-
-# pylint: disable=E0611
-from gi.repository import Soup, SoupGNOME
-from twisted.internet import defer
-
-from ubuntuone.controlpanel import WEBSERVICE_BASE_URL
-from ubuntuone.controlpanel.web_client import (add_oauth_headers,
-                                               WebClientError,
-                                               UnauthorizedError)
-from ubuntuone.controlpanel.logger import setup_logging
-from ubuntuone.storageprotocol.utils import BaseTimestampChecker
-
-logger = setup_logging('webclient')
-
-# full list of status codes
-# http://library.gnome.org/devel/libsoup/stable/libsoup-2.4-soup-status.html
-
-
-class LibsoupTimestampChecker(BaseTimestampChecker):
-    """Specialized TimestampChecker using libsoup."""
-
-    def __init__(self):
-        """Initialize this instance."""
-        super(LibsoupTimestampChecker, self).__init__()
-        self.session = Soup.SessionAsync()
-        self.session.add_feature_by_type(SoupGNOME.ProxyResolverGNOME)
-
-    def _handler(self, session, msg, d):
-        """Handle the result of an http message."""
-        logger.debug("got http response %d for uri %r",
-                     msg.status_code, msg.get_uri().to_string(False))
-        if msg.status_code == 200:
-            date = msg.response_headers.get("Date")
-            d.callback(date)
-        else:
-            e = WebClientError(msg.status_code, "")
-            d.errback(e)
-
-    def get_server_date_header(self, server_url):
-        """Get the server date using twisted webclient."""
-        method = "HEAD"
-        msg = Soup.Message.new(method, server_url)
-        msg.request_headers.append("Cache-Control", "no-cache")
-        d = defer.Deferred()
-        self.session.queue_message(msg, self._handler, d)
-        return d
-
-    def shutdown(self):
-        """End the soup session for this webclient."""
-        self.session.abort()
-
-
-# pylint: disable=C0103
-timestamp_checker = LibsoupTimestampChecker()
-
-
-class WebClient(object):
-    """A client for the u1 webservice."""
-
-    def __init__(self, get_credentials, base_url=WEBSERVICE_BASE_URL):
-        """Initialize the webclient."""
-        self.base_url = base_url
-        self.session = Soup.SessionAsync()
-        self.session.add_feature_by_type(SoupGNOME.ProxyResolverGNOME)
-        self.get_credentials = get_credentials
-
-    def _handler(self, session, msg, d):
-        """Handle the result of an http message."""
-        logger.debug("got http response %d for uri %r",
-                     msg.status_code, msg.get_uri().to_string(False))
-        data = msg.response_body.data
-        if msg.status_code == 200:
-            result = simplejson.loads(data)
-            d.callback(result)
-        else:
-            if msg.status_code in (401,):
-                e = UnauthorizedError(msg.status_code, data)
-            else:
-                e = WebClientError(msg.status_code, data)
-            d.errback(e)
-
-    def _call_api_inner(self, credentials, api_name, timestamp):
-        """Call the webservice with credentials and timestamp."""
-        url = (self.base_url + api_name).encode('utf-8')
-        method = "GET"
-        logger.debug("getting url: %s, %s", method, url)
-        msg = Soup.Message.new(method, url)
-        add_oauth_headers(msg.request_headers.append, method, url,
-                          credentials, timestamp)
-        d = defer.Deferred()
-        self.session.queue_message(msg, self._handler, d)
-        return d
-
-    @defer.inlineCallbacks
-    def _call_api_add_timestamp(self, credentials, api_name):
-        """Add the timestamp to the api call."""
-        timestamp = yield timestamp_checker.get_faithful_time()
-        result = yield self._call_api_inner(credentials, api_name, timestamp)
-        defer.returnValue(result)
-
-    def call_api(self, api_name):
-        """Call the webservice."""
-        # this may log device ID's, but only for removals, which is OK
-        logger.debug("calling api: %s", api_name)
-        d = self.get_credentials()
-        d.addCallback(self._call_api_add_timestamp, api_name)
-        return d
-
-    def shutdown(self):
-        """End the soup session for this webclient."""
-        self.session.abort()

=== removed directory 'ubuntuone/controlpanel/web_client/tests'
=== removed file 'ubuntuone/controlpanel/web_client/tests/__init__.py'
--- ubuntuone/controlpanel/web_client/tests/__init__.py	2011-09-08 23:52:27 +0000
+++ ubuntuone/controlpanel/web_client/tests/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Authors: Alejandro J. Cura <[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/>.
-
-"""Unit tests for the control panel backend webservice clients."""

=== removed file 'ubuntuone/controlpanel/web_client/tests/test_libsoup.py'
--- ubuntuone/controlpanel/web_client/tests/test_libsoup.py	2011-10-06 22:27:57 +0000
+++ ubuntuone/controlpanel/web_client/tests/test_libsoup.py	1970-01-01 00:00:00 +0000
@@ -1,106 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Authors: Alejandro J. Cura <[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/>.
-
-"""Integration tests for the libsoup based webservice client."""
-
-import time
-
-from twisted.application import internet, service
-from twisted.internet import defer
-from twisted.web import http, resource, server
-
-from ubuntuone.controlpanel.tests import TestCase
-from ubuntuone.controlpanel.web_client.libsoup import LibsoupTimestampChecker
-
-
-class MockResource(resource.Resource):
-    """A mock resource."""
-
-    isLeaf = True
-
-    def __init__(self):
-        """Initialize this mock instance."""
-        resource.Resource.__init__(self)
-        self.request_headers = []
-
-    # pylint: disable=C0103
-    def render_GET(self, request):
-        """Render some content."""
-        self.request_headers.append(request.requestHeaders)
-        return "hello!"
-
-
-class MockWebService(object):
-    """A mock webservice for testing"""
-
-    def __init__(self):
-        """Start up this instance."""
-        self.root = MockResource()
-        site = server.Site(self.root)
-        application = service.Application('web')
-        self.service_collection = service.IServiceCollection(application)
-        #pylint: disable=E1101
-        self.tcpserver = internet.TCPServer(0, site)
-        self.tcpserver.setServiceParent(self.service_collection)
-        self.service_collection.startService()
-
-    def get_url(self):
-        """Build the url for this mock server."""
-        #pylint: disable=W0212
-        port_num = self.tcpserver._port.getHost().port
-        return "http://localhost:%d/" % port_num
-
-    def stop(self):
-        """Shut down the service."""
-        #pylint: disable=E1101
-        self.service_collection.stopService()
-
-
-class LibsoupTimestampCheckerTestCase(TestCase):
-    """Tests for LibsoupTimestampChecker."""
-
-    timeout = 3
-
-    @defer.inlineCallbacks
-    def setUp(self):
-        yield super(LibsoupTimestampCheckerTestCase, self).setUp()
-        self.ws = MockWebService()
-        self.addCleanup(self.ws.stop)
-
-    @defer.inlineCallbacks
-    def test_gets_server_date(self):
-        """The server date is gotten right."""
-        fake_time = 1
-        self.patch(time, "time", lambda: fake_time)
-        checker = LibsoupTimestampChecker()
-        self.addCleanup(checker.shutdown)
-        d = checker.get_server_date_header(self.ws.get_url())
-        result = yield d
-        result_time = http.stringToDatetime(result)
-        self.assertEqual(result_time, fake_time)
-
-    @defer.inlineCallbacks
-    def test_server_date_sends_nocache_headers(self):
-        """Getting the server date sends the no-cache headers."""
-        checker = LibsoupTimestampChecker()
-        self.addCleanup(checker.shutdown)
-        yield checker.get_server_date_header(self.ws.get_url())
-        self.assertEqual(len(self.ws.root.request_headers), 1)
-        headers = self.ws.root.request_headers[0]
-        result = headers.getRawHeaders("Cache-Control")
-        self.assertEqual(result, ["no-cache"])

=== removed file 'ubuntuone/controlpanel/web_client/tests/test_txwebclient.py'
--- ubuntuone/controlpanel/web_client/tests/test_txwebclient.py	2011-11-21 13:32:44 +0000
+++ ubuntuone/controlpanel/web_client/tests/test_txwebclient.py	1970-01-01 00:00:00 +0000
@@ -1,177 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Authors: Alejandro J. Cura <[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/>.
-
-"""Unit tests for the control panel backend twisted webservice client."""
-
-import time
-
-from twisted.application import internet, service
-from twisted.internet import defer, reactor
-from twisted.internet.defer import inlineCallbacks
-from twisted.web import server, resource
-from ubuntuone.devtools.testcases import skipIfOS
-
-from ubuntuone.controlpanel.web_client import txwebclient
-from ubuntuone.controlpanel.tests import TestCase
-
-
-SAMPLE_KEY = "result"
-SAMPLE_VALUE = "sample result"
-SAMPLE_RESOURCE = '{"%s": "%s"}' % (SAMPLE_KEY, SAMPLE_VALUE)
-SAMPLE_CREDENTIALS = dict(
-    consumer_key="consumer key",
-    consumer_secret="consumer secret",
-    token="the real token",
-    token_secret="the token secret",
-)
-
-
-def sample_get_credentials():
-    """Will return the sample credentials right now."""
-    return defer.succeed(SAMPLE_CREDENTIALS)
-
-
-class MockResource(resource.Resource):
-    """A simple web resource."""
-    isLeaf = True
-    contents = ""
-
-    # pylint: disable=C0103
-    # t.w.resource methods have freeform cased names
-
-    def getChild(self, name, request):
-        """Get a given child resource."""
-        if name == '':
-            return self
-        return resource.Resource.getChild(self, name, request)
-
-    def render_GET(self, request):
-        """Make a bit of html out of these resource's content."""
-        return self.contents
-
-
-class MockWebService(object):
-    """A mock webservice for testing"""
-
-    def __init__(self):
-        """Start up this instance."""
-        root = resource.Resource()
-        devices_resource = MockResource()
-        devices_resource.contents = SAMPLE_RESOURCE
-        root.putChild("devices", devices_resource)
-        root.putChild("throwerror", resource.NoResource())
-        unauthorized = resource.ErrorPage(resource.http.UNAUTHORIZED,
-                                          "Unauthrorized", "Unauthrorized")
-        root.putChild("unauthorized", unauthorized)
-
-        site = server.Site(root)
-        application = service.Application('web')
-        self.service_collection = service.IServiceCollection(application)
-        #pylint: disable=E1101
-        self.tcpserver = internet.TCPServer(0, site)
-        self.tcpserver.setServiceParent(self.service_collection)
-        self.service_collection.startService()
-
-    def get_url(self):
-        """Build the url for this mock server."""
-        #pylint: disable=W0212
-        port_num = self.tcpserver._port.getHost().port
-        return "http://localhost:%d/" % port_num
-
-    def stop(self):
-        """Shut it down."""
-        #pylint: disable=E1101
-        return self.service_collection.stopService()
-
-
-class FakeAsyncTimestamper(object):
-    """A fake timestamp."""
-
-    def __init__(self):
-        """Initialize this instance."""
-        self.called = False
-
-    def get_faithful_time(self):
-        """Return the server checked timestamp."""
-        self.called = True
-        return defer.succeed(time.time())
-
-
-class WebClientTestCase(TestCase):
-    """Test for the webservice client."""
-
-    timeout = 8
-
-    @defer.inlineCallbacks
-    def setUp(self):
-        yield super(WebClientTestCase, self).setUp()
-        self.ws = MockWebService()
-        test_base_url = self.ws.get_url()
-        self.wc = txwebclient.WebClient(sample_get_credentials, test_base_url)
-        self.timestamper = FakeAsyncTimestamper()
-        self.patch(txwebclient, "timestamp_checker", self.timestamper)
-        self.addCleanup(self.wc.shutdown)
-        self.addCleanup(self.ws.stop)
-
-    @inlineCallbacks
-    def test_get_url(self):
-        """A method is successfully called in the mock webservice."""
-        result = yield self.wc.call_api("devices")
-        self.assertIn(SAMPLE_KEY, result)
-        self.assertEqual(SAMPLE_VALUE, result[SAMPLE_KEY])
-
-    @inlineCallbacks
-    def test_call_api_uses_timestamp(self):
-        """Check that call_api uses the timestamp."""
-        yield self.wc.call_api("devices")
-        self.assertTrue(self.timestamper.called,
-                        "The timestamper must be used.")
-
-    @inlineCallbacks
-    def test_get_url_error(self):
-        """The errback is called when there's some error."""
-        yield self.assertFailure(self.wc.call_api("throwerror"),
-                                 txwebclient.WebClientError)
-
-    @inlineCallbacks
-    def test_unauthorized(self):
-        """Detect when a request failed with UNAUTHORIZED."""
-        yield self.assertFailure(self.wc.call_api("unauthorized"),
-                                 txwebclient.UnauthorizedError)
-
-
-class WebClientShutdownTestCase(TestCase):
-    """The webclient behaviour during shutdown."""
-
-    @skipIfOS('win32', 'Failing on windows, see LP: #851158.')
-    @inlineCallbacks
-    def test_shutdown(self):
-        """The webclient behaves well during shutdown."""
-        self.patch(txwebclient, "timestamp_checker", FakeAsyncTimestamper())
-        d3 = defer.Deferred()
-        # pylint: disable=E1101
-        reactor.callLater(1, d3.callback, None)
-        ws = MockWebService()
-        test_base_url = ws.get_url()
-        wc = txwebclient.WebClient(sample_get_credentials, test_base_url)
-        d1 = wc.call_api("throwerror")
-        d2 = ws.stop()
-        wc.shutdown()
-        yield d2
-        yield defer.DeferredList([d1, d3], fireOnOneCallback=True,
-                                 fireOnOneErrback=True)

=== removed file 'ubuntuone/controlpanel/web_client/txwebclient.py'
--- ubuntuone/controlpanel/web_client/txwebclient.py	2011-10-05 23:12:23 +0000
+++ ubuntuone/controlpanel/web_client/txwebclient.py	1970-01-01 00:00:00 +0000
@@ -1,108 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Authors: Alejandro J. Cura <[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/>.
-
-"""The control panel backend webservice client using twisted.web."""
-
-import simplejson
-
-from twisted.internet import defer, reactor
-from twisted.web import client, error, http
-
-from ubuntuone.controlpanel import WEBSERVICE_BASE_URL
-from ubuntuone.controlpanel.web_client import (add_oauth_headers,
-                                               WebClientError,
-                                               UnauthorizedError)
-
-from ubuntuone.controlpanel.logger import setup_logging
-from ubuntuone.storageprotocol.client import TwistedTimestampChecker
-
-logger = setup_logging('webclient')
-# pylint: disable=C0103
-timestamp_checker = TwistedTimestampChecker()
-
-
-class WebClient(object):
-    """A client for the u1 webservice."""
-
-    def __init__(self, get_credentials, base_url=WEBSERVICE_BASE_URL):
-        """Initialize the webclient."""
-        self.base_url = base_url
-        self.get_credentials = get_credentials
-        self.running = True
-        # pylint: disable=E1101
-        self.trigger_id = reactor.addSystemEventTrigger("before", "shutdown",
-                                                        self.shutdown)
-
-    def _handle_response(self, result):
-        """Handle the response of the webservice call."""
-        return simplejson.loads(result)
-
-    def _handle_error(self, failure):
-        """Handle an error while calling the webservice."""
-        if failure.type == error.Error:
-            exception = failure.value
-            if exception.status == str(http.UNAUTHORIZED):
-                raise UnauthorizedError(exception.status, exception.response)
-            else:
-                raise WebClientError(exception.status, exception.response)
-        else:
-            raise WebClientError(-1, failure)
-
-    def _call_api_inner(self, credentials, api_name, timestamp):
-        """Call the webservice with credentials and timestamp."""
-        url = (self.base_url + api_name).encode('utf-8')
-        method = "GET"
-        logger.debug("getting url: %s, %s", method, url)
-        headers = {}
-        add_oauth_headers(headers.__setitem__, method, url, credentials,
-                          timestamp)
-        d = client.getPage(url, headers=headers)
-        d.addCallback(self._handle_response)
-        d.addErrback(self._handle_error)
-        return d
-
-    @defer.inlineCallbacks
-    def _call_api_add_timestamp(self, credentials, api_name):
-        """Add the timestamp to the api call."""
-        timestamp = yield timestamp_checker.get_faithful_time()
-        result = yield self._call_api_inner(credentials, api_name, timestamp)
-        defer.returnValue(result)
-
-    def call_api(self, api_name):
-        """Call the webservice."""
-        # this may log device ID's, but only for removals, which is OK
-        logger.debug("calling api: %s", api_name)
-        d = self.get_credentials()
-        d.addErrback(self._handle_error)
-        d.addCallback(self._call_api_add_timestamp, api_name)
-        d2 = defer.Deferred()
-        d.addCallback(d2.callback)
-
-        def mask_errors_on_shutdown(failure):
-            """Do not fire the errbacks if we are shutting down."""
-            if self.running:
-                d2.errback(failure)
-
-        d.addErrback(mask_errors_on_shutdown)
-        return d2
-
-    def shutdown(self):
-        """End the pending webclient calls."""
-        self.running = False
-        # pylint: disable=E1101
-        reactor.removeSystemEventTrigger(self.trigger_id)