Ubuntu Single Sign On Client

Merge lp://staging/~dobey/ubuntu-sso-client/update-3-0 into lp://staging/ubuntu-sso-client/stable-3-0

  1. update-3-0
  2. Merge into stable-3-0
Proposed by dobey
Status: Merged
Approved by: dobey
Approved revision: 840
Merged at revision: 840
Proposed branch: lp://staging/~dobey/ubuntu-sso-client/update-3-0
Merge into: lp://staging/ubuntu-sso-client/stable-3-0
Diff against target: 204 lines (+93/-8)
8 files modified
ubuntu_sso/gtk/gui.py (+18/-0)
ubuntu_sso/gtk/tests/test_gui.py (+7/-0)
ubuntu_sso/main/linux.py (+6/-1)
ubuntu_sso/main/tests/test_linux.py (+59/-0)
ubuntu_sso/qt/current_user_sign_in_page.py (+1/-3)
ubuntu_sso/qt/setup_account_page.py (+0/-1)
ubuntu_sso/qt/tests/test_current_user_sign_in_page.py (+1/-1)
ubuntu_sso/qt/tests/test_setup_account.py (+1/-2)
To merge this branch: bzr merge lp://staging/~dobey/ubuntu-sso-client/update-3-0
Reviewer Review Type Date Requested Status
Roberto Alsina (community) Approve
Brian Curtin (community) Approve
Review via email: mp+110177@code.staging.launchpad.net

Commit message

[Rodney Dawes]

    Ensure we are using strict ssl with the system ca-certificates.crt file
    Trap DBusException when getting the SessionBus, and add a test case for it

[Roberto Alsina]

    Remove back buttons in signin/signup pages (Fixes LP:1009107).

To post a comment you must log in.
Revision history for this message
Brian Curtin (brian.curtin) :
review: Approve
Revision history for this message
Roberto Alsina (ralsina) :
review: Approve
Revision history for this message
Ubuntu One Auto Pilot (otto-pilot) wrote :

The attempt to merge lp:~dobey/ubuntu-sso-client/update-3-0 into lp:ubuntu-sso-client/stable-3-0 failed. Below is the output from the failed tests.

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

The attempt to merge lp:~dobey/ubuntu-sso-client/update-3-0 into lp:ubuntu-sso-client/stable-3-0 failed. Below is the output from the failed tests.

*** Running GTK test suite for ubuntu_sso ***
ubuntu_sso.utils.tests.test_parse_args
  ParseArgsTestCase
    test_parse_args_app_name_is_required ... [OK]
    test_parse_args_defaults ... [OK]
    test_parse_args_help_text ... [OK]
    test_parse_args_login_only ... [OK]
    test_parse_args_ping_url ... [OK]
    test_parse_args_policy_url ... [OK]
    test_parse_args_tc_url ... [OK]
    test_parse_args_window_id ... [OK]
twisted.trial.unittest
  TestCase
    runTest ... [OK]
ubuntu_sso.utils.tests.test_tcpactivation
  ActivationClientTestCase
    test_do_get_active_port_not_running ... [OK]
    test_do_get_active_port_running ... [OK]
    test_get_active_port_waits_classwide ... [OK]
    test_initialization ... [OK]
    test_spawn_server ... [OK]
    test_wait_server_active ... [OK]
    test_wait_server_timeouts ... [OK]
  ActivationConfigTestCase
    test_initialization ... [OK]
  ActivationDetectorTestCase
    test_initialization ... [OK]
    test_is_already_running ... [OK]
    test_is_not_already_running ... [OK]
  ActivationInstanceTestCase
    test_get_port ... [OK]
    test_get_port_fails_if_service_already_started ... [OK]
    test_initialization ... [OK]
  AsyncSleepTestCase
    test_async_sleep_fired_at_the_right_time ... [OK]
    test_async_sleep_not_fired_immediately ... [OK]
    test_async_sleep_not_fired_in_a_bit ... [OK]
  NullProtocolTestCase
    test_drops_connection ... [OK]
  PortDetectFactoryTestCase
    test_connection_failed ... [OK]
    test_connection_failed_then_lost ... [OK]
    test_connection_lost ... [OK]
    test_connection_works_then_lost ... [OK]
    test_is_listening ... [OK]
twisted.trial.unittest
  TestCase
    runTest ... [OK]
ubuntu_sso.u...

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: