Merge lp:~dobey/ubuntuone-control-panel/update-13-10 into lp:ubuntuone-control-panel/stable-13-10

[dobey]

[Rodney Dawes]

    - Include the scheme and host in the timestamp test, as new oauthlib bails on signing if the values are not included in the URI.

[Michael McCracken]

    - Fix a lint issue that was causing build failure on saucy.

[Natalia B. Bidart]

    - Allow Ubuntu One base URL to be overridden using an environment variable.

[Roberto Alsina (ralsina)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~dobey/ubuntuone-control-panel/update-13-10 into lp:ubuntuone-control-panel/stable-13-10 failed. Below is the output from the failed tests.

*** Running DBus test suite ***

Traceback (most recent call last):
  File "/usr/bin/u1trial", line 40, in <module>
    main()
  File "/usr/lib/python2.7/dist-packages/ubuntuone-dev-tools/ubuntuone/devtools/runners/__init__.py", line 277, in main
    suite = test_runner.get_suite(options)
  File "/usr/lib/python2.7/dist-packages/ubuntuone-dev-tools/ubuntuone/devtools/runners/__init__.py", line 173, in get_suite
    config['ignore-paths']))
  File "/usr/lib/python2.7/dist-packages/ubuntuone-dev-tools/ubuntuone/devtools/runners/__init__.py", line 157, in _collect_tests
    module_suite = self._load_unittest(filepath)
  File "/usr/lib/python2.7/dist-packages/ubuntuone-dev-tools/ubuntuone/devtools/runners/__init__.py", line 98, in _load_unittest
    module = __import__(modpath, None, None, [""])
  File "/mnt/tarmac/cache/ubuntuone-control-panel/stable-13-10/ubuntuone/controlpanel/dbustests/__init__.py", line 28, in <module>
    from ubuntuone.controlpanel import dbus_service
  File "/mnt/tarmac/cache/ubuntuone-control-panel/stable-13-10/ubuntuone/controlpanel/dbus_service.py", line 27, in <module>
    from ubuntuone.syncdaemon.interaction_interfaces import bool_str
ImportError: No module named syncdaemon.interaction_interfaces

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~dobey/ubuntuone-control-panel/update-13-10 into lp:ubuntuone-control-panel/stable-13-10 failed. Below is the output from the failed tests.

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

[lp:~dobey/ubuntuone-control-panel/update-13-10]

408. By dobey on 2013-09-18

Merge test fix.

=== modified file 'setup.py'
--- setup.py	2013-08-05 20:19:28 +0000
+++ setup.py	2013-09-18 16:51:21 +0000
@@ -113,7 +113,7 @@
                      (qrc_file, py_file)) > 0:
             self.warn('Unable to generate python module {py_file}'
                       ' for resource file {qrc_file}'.format(
-                      py_file=py_file, qrc_file=qrc_file))
+                          py_file=py_file, qrc_file=qrc_file))
             if not os.path.exists(py_file) or not file(py_file).read():
                 raise SystemExit(1)
         else:

=== modified file 'ubuntuone/controlpanel/__init__.py'
--- ubuntuone/controlpanel/__init__.py	2012-11-29 19:36:53 +0000
+++ ubuntuone/controlpanel/__init__.py	2013-09-18 16:51:21 +0000
@@ -24,9 +24,13 @@
 
 """
 
+import os
+
 # constants
 DBUS_BUS_NAME = "com.ubuntuone.controlpanel"
 DBUS_PREFERENCES_PATH = "/preferences"
 DBUS_PREFERENCES_IFACE = "com.ubuntuone.controlpanel.Preferences"
 
-WEBSERVICE_BASE_URL = u"https://one.ubuntu.com/api/"
+UBUNTUONE_BASE_URL = os.environ.get(
+    'UONE_BASE_URL', u'https://one.ubuntu.com').rstrip('/') + '/'
+WEBSERVICE_BASE_URL = UBUNTUONE_BASE_URL + u'api/'

=== modified file 'ubuntuone/controlpanel/backend.py'
--- ubuntuone/controlpanel/backend.py	2013-02-22 19:54:41 +0000
+++ ubuntuone/controlpanel/backend.py	2013-09-18 16:51:21 +0000
@@ -28,7 +28,12 @@
                                     DeferredLock)
 from ubuntuone.platform.credentials import CredentialsManagementTool
 
-from ubuntuone.controlpanel import sd_client, replication_client
+from ubuntuone.controlpanel import (
+    UBUNTUONE_BASE_URL,
+    WEBSERVICE_BASE_URL,
+    replication_client,
+    sd_client,
+)
 from ubuntuone.controlpanel.logger import setup_logging, log_call
 from ubuntuone.controlpanel.web_client import WebClient
 from ubuntu_sso.utils.webclient.common import (
@@ -73,8 +78,8 @@
 
 CONTACTS_PKG = 'thunderbird-couchdb'
 
-UBUNTUONE_FROM_OAUTH = u'https://one.ubuntu.com/api/1.0/from_oauth/'
-UBUNTUONE_LINK = u'https://one.ubuntu.com/'
+UBUNTUONE_FROM_OAUTH = WEBSERVICE_BASE_URL + u'1.0/from_oauth/'
+UBUNTUONE_LINK = UBUNTUONE_BASE_URL
 
 
 def append_path_sep(path):

=== modified file 'ubuntuone/controlpanel/gui/__init__.py'
--- ubuntuone/controlpanel/gui/__init__.py	2013-06-12 14:32:34 +0000
+++ ubuntuone/controlpanel/gui/__init__.py	2013-09-18 16:51:21 +0000
@@ -70,7 +70,7 @@
 
 FILE_URI_PREFIX = u'file://'
 
-ACCEPT_SHARES = 'https://one.ubuntu.com/files/shareoffer/%s/'
+ACCEPT_SHARES = UBUNTUONE_LINK + u'files/shareoffer/%s/'
 CONTACTS_LINK = UBUNTUONE_LINK
 DASHBOARD = UBUNTUONE_LINK + u'dashboard/'
 EDIT_ACCOUNT_LINK = UBUNTUONE_LINK + u'account/'

=== modified file 'ubuntuone/controlpanel/tests/test_web_client.py'
--- ubuntuone/controlpanel/tests/test_web_client.py	2013-05-31 16:49:34 +0000
+++ ubuntuone/controlpanel/tests/test_web_client.py	2013-09-18 16:51:21 +0000
@@ -199,7 +199,8 @@
     @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')
+        signed = yield self.wc.build_signed_iri(
+            SAMPLE_TARGET + u'/blah?foo=bar')
         parsed_signed = urlparse(signed)
         signed_query = parse_qs(parsed_signed.query)