Ubuntu Single Sign On Client

Merge lp:~alecu/ubuntu-sso-client/qt-defer-to-thread into lp:ubuntu-sso-client

qt-defer-to-thread
Merge into trunk

Proposed by Alejandro J. Cura on 2012-03-30

Status:

Merged

Approved by:

Alejandro J. Cura on 2012-03-30

Approved revision:

945

Merged at revision:

938

Proposed branch:

lp:~alecu/ubuntu-sso-client/qt-defer-to-thread

Merge into:

lp:ubuntu-sso-client

Diff against target:

0 lines

To merge this branch:

bzr merge lp:~alecu/ubuntu-sso-client/qt-defer-to-thread

High

Fix Released

Link a bug report

Reviewer	Date Requested	Status
Roberto Alsina (community)		Approve on 2012-03-30
Eric Casteleijn (community)	2012-03-30	Approve on 2012-03-30
Review via email: mp+100132@code.launchpad.net

Commit Message

- Make windows Keyring no longer depend on twisted (LP: #969159).

Eric Casteleijn (thisfred) wrote on 2012-03-30:

Looks good

review: Approve

Roberto Alsina (ralsina) wrote on 2012-03-30:

Shouldn't you add a test for the code arund line 32 of the diff? (inserting python in the args)

review: Needs Information

Roberto Alsina (ralsina) on 2012-03-30:

review: Approve

Ubuntu One Auto Pilot (otto-pilot) wrote on 2012-03-30:

Download full text (150.6 KiB)

The attempt to merge lp:~alecu/ubuntu-sso-client/qt-defer-to-thread into lp:ubuntu-sso-client failed. Below is the output from the failed tests.

*** Running GTK test suite for ubuntu_sso ***
ubuntu_sso.xdg_base_directory.tests.test_common
  TestBaseDirectory
    test_load_config_paths_filter ... [OK]
    test_save_config_path ... [OK]
    test_xdg_cache_home_is_utf8_bytes ... [OK]
    test_xdg_config_dirs_are_bytes ... [OK]
    test_xdg_config_home_is_utf8_bytes ... [OK]
    test_xdg_data_dirs_are_bytes ... [OK]
    test_xdg_data_home_is_utf8_bytes ... [OK]
    test_xdg_home_is_utf8_bytes ... [OK]
twisted.trial.unittest
  TestCase
    runTest ... [OK]
ubuntu_sso.gtk.tests.test_main
  BasicTestCase
    test_main ... [OK]
twisted.trial.unittest
  TestCase
    runTest ... [OK]
ubuntu_sso.gtk.tests.test_gui
  BasicTestCase
    runTest ... [OK]
  BasicUbuntuSSOClientTestCase
    test_app_name_is_stored ... [OK]
    test_cancel_buttons_close_window ... [OK]
    test_close_callback_if_not_set ... [OK]
    test_closing_main_window_calls_close_callback ... [OK]
    test_entries_activates_default ... [OK]
    test_finish_error_shows_error_page ... [OK]
    test_finish_success_shows_success_page ... [OK]
    test_initial_text_for_entries ... [OK]
    test_main_window_is_resizable ... [OK]
    test_main_window_is_visible_at_startup ... [OK]
    test_pages_are_packed_into_container ... [OK]
    test_password_fields_are_password ... [OK]
    test_signals_are_removed ... [OK]
    test_warning_fields_are_cleared ... [OK]
    test_window_icon ... [OK]
  DefaultButtonsTestCase
    test_default_widget_can_default ... [OK]
    test_pages_have_default_widget_set ... [OK]
    test_set_current_page_grabs_focus_for_default_button ... [OK]
  EnterDetailsTestCase
    test_captcha_filename_is_different_each_time ... [OK]
    test_captcha_id_is_stored_when_captcha_is_available ... [OK]
    test_captcha_image_is_a_spinner_at_first ... [OK]
    test_captcha_image_is_not_visible_at_startup ... ...