Merge lp://qastaging/~dobey/ubuntuone-control-panel/update-4-0 into lp://qastaging/ubuntuone-control-panel/stable-4-0

Proposed by dobey
Status: Merged
Approved by: dobey
Approved revision: 343
Merged at revision: 343
Proposed branch: lp://qastaging/~dobey/ubuntuone-control-panel/update-4-0
Merge into: lp://qastaging/ubuntuone-control-panel/stable-4-0
Diff against target: 1026 lines (+715/-31)
8 files modified
ubuntuone/controlpanel/gui/qt/share_file.py (+7/-5)
ubuntuone/controlpanel/gui/qt/share_links.py (+23/-9)
ubuntuone/controlpanel/gui/qt/share_links_search.py (+14/-3)
ubuntuone/controlpanel/gui/qt/tests/test_share_file.py (+5/-2)
ubuntuone/controlpanel/gui/qt/tests/test_share_links.py (+18/-0)
ubuntuone/controlpanel/gui/qt/tests/test_share_links_search.py (+47/-12)
ubuntuone/controlpanel/utils/darwin.py (+375/-0)
ubuntuone/controlpanel/utils/tests/test_darwin.py (+226/-0)
To merge this branch: bzr merge lp://qastaging/~dobey/ubuntuone-control-panel/update-4-0
Reviewer Review Type Date Requested Status
Mike McCracken (community) Approve
Review via email: mp+127559@code.qastaging.launchpad.net

Commit message

[Diego Sarmentero]

    - Accept mouse events in shares search pop-up list. (LP: #1056192)

[Mike McCracken]

    - Use darwin ServiceManagement API to install/check/upgrade fsevents daemon.

[Brian Curtin]

    - Use os.path.join to construct platform-safe paths in share links tests.

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 (192.8 KiB)

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

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: