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
Approved by: dobey
Approved revision: no longer in the source branch.
Merged at revision: 381
Proposed branch: lp://staging/~dobey/ubuntuone-control-panel/update-4-2
Merge into: lp://staging/ubuntuone-control-panel/stable-4-2
Diff against target: 369 lines (+103/-57)
8 files modified
ubuntuone/controlpanel/backend.py (+6/-3)
ubuntuone/controlpanel/gui/qt/main/darwin.py (+14/-3)
ubuntuone/controlpanel/gui/qt/main/tests/test_darwin.py (+44/-34)
ubuntuone/controlpanel/tests/test_backend.py (+9/-3)
ubuntuone/controlpanel/tests/test_web_client.py (+9/-4)
ubuntuone/controlpanel/utils/darwin.py (+13/-2)
ubuntuone/controlpanel/utils/tests/test_darwin.py (+6/-6)
ubuntuone/controlpanel/utils/tests/test_linux.py (+2/-2)
To merge this branch: bzr merge lp://staging/~dobey/ubuntuone-control-panel/update-4-2
Reviewer Review Type Date Requested Status
Mike McCracken (community) Approve
Review via email: mp+149948@code.staging.launchpad.net

Commit message

[Mike McCracken]

    - Use officially recommended API for creating file URLs. (LP: #1112792)
    - Change quit handler to quit immediately. (LP: #1042834)

[Rodney Dawes]

    - Append query arguments to the URI, rather than passing in as parameters.
    - Fix new pyflakes warnings about variable redefinition in list comprehensions.

To post a comment you must log in.
Revision history for this message
Mike McCracken (mikemc) :
review: Approve
Revision history for this message
Ubuntu One Auto Pilot (otto-pilot) wrote :
Download full text (78.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
381. By Mike McCracken

[Mike McCracken]

    - Use officially recommended API for creating file URLs. (LP: #1112792)
    - Change quit handler to quit immediately. (LP: #1042834)

[Rodney Dawes]

    - Append query arguments to the URI, rather than passing in as parameters.
    - Fix new pyflakes warnings about variable redefinition in list comprehensions.

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: