Ubuntu One Control Panel

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

  1. update-4-0
  2. Merge into stable-4-0
Proposed by dobey
Status: Merged
Approved by: dobey
Approved revision: no longer in the source branch.
Merged at revision: 332
Proposed branch: lp://qastaging/~dobey/ubuntuone-control-panel/update-4-0
Merge into: lp://qastaging/ubuntuone-control-panel/stable-4-0
Diff against target: 135 lines (+53/-6)
5 files modified
bin/ubuntuone-control-panel-qt (+2/-2)
ubuntuone/controlpanel/gui/qt/gui.py (+4/-3)
ubuntuone/controlpanel/gui/qt/main/__init__.py (+13/-1)
ubuntuone/controlpanel/gui/qt/main/tests/test_main.py (+33/-0)
ubuntuone/controlpanel/gui/qt/tests/test_start.py (+1/-0)
To merge this branch: bzr merge lp://qastaging/~dobey/ubuntuone-control-panel/update-4-0
Reviewer Review Type Date Requested Status
Alejandro J. Cura (community) trivial Approve
Review via email: mp+115607@code.qastaging.launchpad.net

Commit message

[Mike McCracken]

    - Call raise_() after show() to ensure the window is brought to the front on darwin. (LP: #1018614)
    - On Darwin, install qt4reactor after QApplication is created. (LP: #1015825)

[Diego Sarmentero]

    - Replacing side widget logo (LP: #1020187).

To post a comment you must log in.
Revision history for this message
Alejandro J. Cura (alecu) wrote :

+1

review: Approve (trivial)
Revision history for this message
Ubuntu One Auto Pilot (otto-pilot) wrote :
Download full text (252.9 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...

lp://qastaging/~dobey/ubuntuone-control-panel/update-4-0 updated
332. By Diego Sarmentero

[Mike McCracken]

    - Call raise_() after show() to ensure the window is brought to the front on darwin. (LP: #1018614)
    - On Darwin, install qt4reactor after QApplication is created. (LP: #1015825)

[Diego Sarmentero]

    - Replacing side widget logo (LP: #1020187).

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: