Merge lp:~nataliabidart/ubuntuone-control-panel/override-urls into lp:ubuntuone-control-panel

[Natalia Bidart]

- Allow Ubuntu One base url to be overridden using env var.

[Alejandro J. Cura (alecu)]

Looks good. I like the fix for the trailing /, we should apply it to all our projects.

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~nataliabidart/ubuntuone-control-panel/override-urls into lp:ubuntuone-control-panel 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/trunk/ubuntuone/controlpanel/dbustests/__init__.py", line 28, in <module>
    from ubuntuone.controlpanel import dbus_service
  File "/mnt/tarmac/cache/ubuntuone-control-panel/trunk/ubuntuone/controlpanel/dbus_service.py", line 27, in <module>
    from ubuntuone.syncdaemon.interaction_interfaces import bool_str
ImportError: No module named syncdaemon.interaction_interfaces

=== modified file 'ubuntuone/controlpanel/__init__.py'
--- ubuntuone/controlpanel/__init__.py	2012-11-29 19:36:53 +0000
+++ ubuntuone/controlpanel/__init__.py	2013-08-27 23:44:10 +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-08-27 23:44:10 +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-08-27 23:44:10 +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/'