Ubuntu One Control Panel

Merge lp://staging/~dobey/ubuntuone-control-panel/update-4-2 into lp://staging/ubuntuone-control-panel/stable-4-2

  1. update-4-2
  2. Merge into stable-4-2
Proposed by dobey
Status: Merged
Merged at revision: 377
Proposed branch: lp://staging/~dobey/ubuntuone-control-panel/update-4-2
Merge into: lp://staging/ubuntuone-control-panel/stable-4-2
Diff against target: 1230 lines (+763/-157)
13 files modified
bin/ubuntuone-updater (+184/-0)
setup.py (+1/-1)
ubuntuone/controlpanel/__init__.py (+0/-1)
ubuntuone/controlpanel/gui/__init__.py (+8/-10)
ubuntuone/controlpanel/gui/qt/gui.py (+1/-1)
ubuntuone/controlpanel/gui/qt/main/__init__.py (+3/-1)
ubuntuone/controlpanel/utils/__init__.py (+5/-3)
ubuntuone/controlpanel/utils/common.py (+128/-0)
ubuntuone/controlpanel/utils/darwin.py (+59/-8)
ubuntuone/controlpanel/utils/tests/test_common.py (+233/-0)
ubuntuone/controlpanel/utils/tests/test_darwin.py (+105/-16)
ubuntuone/controlpanel/utils/tests/test_windows.py (+22/-79)
ubuntuone/controlpanel/utils/windows.py (+14/-37)
To merge this branch: bzr merge lp://staging/~dobey/ubuntuone-control-panel/update-4-2
Reviewer Review Type Date Requested Status
Brian Curtin (community) Approve
Review via email: mp+142744@code.staging.launchpad.net

Commit message

[Mike McCracken]
    - Remove a debug print statement in the tests that snuck through.
    - Use new SSO API to get platform-appropriate translation function. (LP: 1074116)
    - Add u1 folder to OS X Finder favorites sidebar on first launch.

[Brian Curtin]

    - Add common updater script for mac and windows. (LP: #1087262)

To post a comment you must log in.
Revision history for this message
Brian Curtin (brian.curtin) :
review: Approve
Revision history for this message
Ubuntu One Auto Pilot (otto-pilot) wrote :
Download full text (7.3 KiB)

The attempt to merge lp:~dobey/ubuntuone-control-panel/update-4-2 into lp:ubuntuone-control-panel/stable-4-2 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...

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

The attempt to merge lp:~dobey/ubuntuone-control-panel/update-4-2 into lp:ubuntuone-control-panel/stable-4-2 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...

lp://staging/~dobey/ubuntuone-control-panel/update-4-2 updated
377. By dobey

[Mike McCracken]
    - Remove a debug print statement in the tests that snuck through.
    - Use new SSO API to get platform-appropriate translation function. (LP: 1074116)
    - Add u1 folder to OS X Finder favorites sidebar on first launch.

[Brian Curtin]

    - Add common updater script for mac and windows. (LP: #1087262)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: