Merge lp:~dobey/ubuntuone-control-panel/fix-clientdefs-import into lp:ubuntuone-control-panel

Proposed by dobey on 2013-06-12
Status: Merged
Approved by: dobey on 2013-06-12
Approved revision: 405
Merged at revision: 405
Proposed branch: lp:~dobey/ubuntuone-control-panel/fix-clientdefs-import
Merge into: lp:ubuntuone-control-panel
Diff against target: 21 lines (+2/-4)
1 file modified
ubuntuone/controlpanel/gui/__init__.py (+2/-4)
To merge this branch: bzr merge lp:~dobey/ubuntuone-control-panel/fix-clientdefs-import
Reviewer Review Type Date Requested Status
Diego Sarmentero (community) 2013-06-12 Approve on 2013-06-12
Review via email: mp+168976@code.launchpad.net

Commit message

Don't import APP_NAME from ubuntuone.clientdefs. Get it from SSO now.

Description of the change

To post a comment you must log in.
Diego Sarmentero (diegosarmentero) wrote :

+1

review: Approve
Ubuntu One Auto Pilot (otto-pilot) wrote :
Download full text (7.3 KiB)

The attempt to merge lp:~dobey/ubuntuone-control-panel/fix-clientdefs-import into lp:ubuntuone-control-panel 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]
    t...

Read more...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntuone/controlpanel/gui/__init__.py'
2--- ubuntuone/controlpanel/gui/__init__.py 2012-12-11 19:04:12 +0000
3+++ ubuntuone/controlpanel/gui/__init__.py 2013-06-12 15:09:27 +0000
4@@ -1,6 +1,6 @@
5 # -*- coding: utf-8 -*-
6 #
7-# Copyright 2011-2012 Canonical Ltd.
8+# Copyright 2011-2013 Canonical Ltd.
9 #
10 # This program is free software: you can redistribute it and/or modify it
11 # under the terms of the GNU General Public License version 3, as published
12@@ -18,9 +18,7 @@
13
14 import os
15
16-# pylint: disable=W0611
17-from ubuntuone.clientdefs import APP_NAME
18-# pylint: enable=W0611
19+from ubuntu_sso.constants import APP_NAME
20
21 from ubuntu_sso.utils.translation import get_gettext
22

Subscribers

People subscribed via source and target branches

to all changes: