Ubuntu One Control Panel

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

  1. update-13-10
  2. Merge into stable-13-10
Proposed by dobey
Status: Merged
Approved by: dobey
Approved revision: 408
Merged at revision: 407
Proposed branch: lp:~dobey/ubuntuone-control-panel/update-13-10
Merge into: lp:ubuntuone-control-panel/stable-13-10
Diff against target: 86 lines (+17/-7)
5 files modified
setup.py (+1/-1)
ubuntuone/controlpanel/__init__.py (+5/-1)
ubuntuone/controlpanel/backend.py (+8/-3)
ubuntuone/controlpanel/gui/__init__.py (+1/-1)
ubuntuone/controlpanel/tests/test_web_client.py (+2/-1)
To merge this branch: bzr merge lp:~dobey/ubuntuone-control-panel/update-13-10
Reviewer Review Type Date Requested Status
Roberto Alsina (community) Approve
Review via email: mp+186152@code.launchpad.net

Commit message

[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.

To post a comment you must log in.
Revision history for this message
Roberto Alsina (ralsina) :
review: Approve
Revision history for this message
Ubuntu One Auto Pilot (otto-pilot) wrote :

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

Revision history for this message
Ubuntu One Auto Pilot (otto-pilot) wrote :
Download full text (98.0 KiB)

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 updated
408. By dobey

Merge test fix.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
113 (qrc_file, py_file)) > 0:113 (qrc_file, py_file)) > 0:
114 self.warn('Unable to generate python module {py_file}'114 self.warn('Unable to generate python module {py_file}'
115 ' for resource file {qrc_file}'.format(115 ' for resource file {qrc_file}'.format(
116 py_file=py_file, qrc_file=qrc_file))116 py_file=py_file, qrc_file=qrc_file))
117 if not os.path.exists(py_file) or not file(py_file).read():117 if not os.path.exists(py_file) or not file(py_file).read():
118 raise SystemExit(1)118 raise SystemExit(1)
119 else:119 else:
120120
=== 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 @@
2424
25"""25"""
2626
27import os
28
27# constants29# constants
28DBUS_BUS_NAME = "com.ubuntuone.controlpanel"30DBUS_BUS_NAME = "com.ubuntuone.controlpanel"
29DBUS_PREFERENCES_PATH = "/preferences"31DBUS_PREFERENCES_PATH = "/preferences"
30DBUS_PREFERENCES_IFACE = "com.ubuntuone.controlpanel.Preferences"32DBUS_PREFERENCES_IFACE = "com.ubuntuone.controlpanel.Preferences"
3133
32WEBSERVICE_BASE_URL = u"https://one.ubuntu.com/api/"34UBUNTUONE_BASE_URL = os.environ.get(
35 'UONE_BASE_URL', u'https://one.ubuntu.com').rstrip('/') + '/'
36WEBSERVICE_BASE_URL = UBUNTUONE_BASE_URL + u'api/'
3337
=== 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 @@
28 DeferredLock)28 DeferredLock)
29from ubuntuone.platform.credentials import CredentialsManagementTool29from ubuntuone.platform.credentials import CredentialsManagementTool
3030
31from ubuntuone.controlpanel import sd_client, replication_client31from ubuntuone.controlpanel import (
32 UBUNTUONE_BASE_URL,
33 WEBSERVICE_BASE_URL,
34 replication_client,
35 sd_client,
36)
32from ubuntuone.controlpanel.logger import setup_logging, log_call37from ubuntuone.controlpanel.logger import setup_logging, log_call
33from ubuntuone.controlpanel.web_client import WebClient38from ubuntuone.controlpanel.web_client import WebClient
34from ubuntu_sso.utils.webclient.common import (39from ubuntu_sso.utils.webclient.common import (
@@ -73,8 +78,8 @@
7378
74CONTACTS_PKG = 'thunderbird-couchdb'79CONTACTS_PKG = 'thunderbird-couchdb'
7580
76UBUNTUONE_FROM_OAUTH = u'https://one.ubuntu.com/api/1.0/from_oauth/'81UBUNTUONE_FROM_OAUTH = WEBSERVICE_BASE_URL + u'1.0/from_oauth/'
77UBUNTUONE_LINK = u'https://one.ubuntu.com/'82UBUNTUONE_LINK = UBUNTUONE_BASE_URL
7883
7984
80def append_path_sep(path):85def append_path_sep(path):
8186
=== 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 @@
7070
71FILE_URI_PREFIX = u'file://'71FILE_URI_PREFIX = u'file://'
7272
73ACCEPT_SHARES = 'https://one.ubuntu.com/files/shareoffer/%s/'73ACCEPT_SHARES = UBUNTUONE_LINK + u'files/shareoffer/%s/'
74CONTACTS_LINK = UBUNTUONE_LINK74CONTACTS_LINK = UBUNTUONE_LINK
75DASHBOARD = UBUNTUONE_LINK + u'dashboard/'75DASHBOARD = UBUNTUONE_LINK + u'dashboard/'
76EDIT_ACCOUNT_LINK = UBUNTUONE_LINK + u'account/'76EDIT_ACCOUNT_LINK = UBUNTUONE_LINK + u'account/'
7777
=== 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 @@
199 @defer.inlineCallbacks199 @defer.inlineCallbacks
200 def test_uses_timestamper(self):200 def test_uses_timestamper(self):
201 """Test that the signed url is using the serverrelative timestamp."""201 """Test that the signed url is using the serverrelative timestamp."""
202 signed = yield self.wc.build_signed_iri(u'/blah?foo=bar')202 signed = yield self.wc.build_signed_iri(
203 SAMPLE_TARGET + u'/blah?foo=bar')
203 parsed_signed = urlparse(signed)204 parsed_signed = urlparse(signed)
204 signed_query = parse_qs(parsed_signed.query)205 signed_query = parse_qs(parsed_signed.query)
205206

Subscribers

People subscribed via source and target branches

to all changes: