Merge lp://qastaging/~dobey/ubuntuone-control-panel/no-msg-menu into lp://qastaging/ubuntuone-control-panel

Proposed by dobey
Status: Merged
Approved by: dobey
Approved revision: 383
Merged at revision: 386
Proposed branch: lp://qastaging/~dobey/ubuntuone-control-panel/no-msg-menu
Merge into: lp://qastaging/ubuntuone-control-panel
Diff against target: 39 lines (+2/-5)
2 files modified
setup.py (+2/-4)
ubuntuone-control-panel.in (+0/-1)
To merge this branch: bzr merge lp://qastaging/~dobey/ubuntuone-control-panel/no-msg-menu
Reviewer Review Type Date Requested Status
Mike McCracken (community) Approve
Review via email: mp+134467@code.qastaging.launchpad.net

Commit message

Remove messaging menu integration file.

To post a comment you must log in.
Revision history for this message
Mike McCracken (mikemc) wrote :

Looks good.

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

The attempt to merge lp:~dobey/ubuntuone-control-panel/no-msg-menu 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]
    test_start_...

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: