Merge lp://qastaging/~mikemc/ubuntuone-control-panel/fix-1018614-darwin-raise into lp://qastaging/ubuntuone-control-panel

Proposed by Mike McCracken
Status: Merged
Approved by: Mike McCracken
Approved revision: 338
Merged at revision: 337
Proposed branch: lp://qastaging/~mikemc/ubuntuone-control-panel/fix-1018614-darwin-raise
Merge into: lp://qastaging/ubuntuone-control-panel
Diff against target: 34 lines (+5/-3)
2 files modified
ubuntuone/controlpanel/gui/qt/gui.py (+4/-3)
ubuntuone/controlpanel/gui/qt/tests/test_start.py (+1/-0)
To merge this branch: bzr merge lp://qastaging/~mikemc/ubuntuone-control-panel/fix-1018614-darwin-raise
Reviewer Review Type Date Requested Status
Manuel de la Peña (community) Approve
Brian Curtin (community) Approve
Roberto Alsina (community) Approve
Review via email: mp+112493@code.qastaging.launchpad.net

Commit message

- Call raise_() after show() to ensure the window is brought to the front on darwin. (LP: #1018614)

Description of the change

- Call raise_() after show() to ensure the window is brought to the front on darwin. (LP: #1018614)

To post a comment you must log in.
Revision history for this message
Manuel de la Peña (mandel) wrote :

Can we add a test in which we assert that raise is not called in anything but darwin. You can patch the sys.platform used in gui.py to return darwin or order according to the test.

review: Needs Fixing
Revision history for this message
Roberto Alsina (ralsina) wrote :

I think calling raise_ doesn't hurt in any platorm, so we may just get rid of the if.

Of course, someone needs to test that :)

Revision history for this message
Mike McCracken (mikemc) wrote :

Changed to call raise_ on every platform as Roberto suggested.
Verified on ubuntu and windows that it still works as expected.
On those platforms it should be unnecessary but doesn't hurt.

Revision history for this message
Roberto Alsina (ralsina) :
review: Approve
Revision history for this message
Brian Curtin (brian.curtin) wrote :

Looks alright to me.

review: Approve
Revision history for this message
Manuel de la Peña (mandel) :
review: Approve
Revision history for this message
Ubuntu One Auto Pilot (otto-pilot) wrote :
Download full text (154.5 KiB)

The attempt to merge lp:~mikemc/ubuntuone-control-panel/fix-1018614-darwin-raise 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]
 ...

338. By Mike McCracken

fix pep8 complaints

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