Ubuntu Single Sign On Client

Merge lp://staging/~dobey/ubuntu-sso-client/update-4-0 into lp://staging/ubuntu-sso-client/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: 962
Proposed branch: lp://staging/~dobey/ubuntu-sso-client/update-4-0
Merge into: lp://staging/ubuntu-sso-client/stable-4-0
Diff against target: 5938 lines (+230/-4813)
46 files modified
README (+6/-12)
bin/ubuntu-sso-login (+1/-1)
bin/ubuntu-sso-login-gtk (+0/-44)
bin/ubuntu-sso-login-qt (+1/-1)
bin/ubuntu-sso-proxy-creds-qt (+1/-1)
bin/ubuntu-sso-ssl-certificate-qt (+1/-1)
data/gtk/ui.glade (+0/-920)
po/POTFILES.in (+0/-1)
run-mac-tests (+2/-3)
run-tests (+1/-13)
run-tests.bat (+2/-2)
setup.py (+1/-3)
ubuntu_sso/__init__.py (+3/-7)
ubuntu_sso/credentials.py (+13/-19)
ubuntu_sso/gtk/__init__.py (+0/-29)
ubuntu_sso/gtk/gui.py (+0/-1152)
ubuntu_sso/gtk/main.py (+0/-41)
ubuntu_sso/gtk/tests/__init__.py (+0/-29)
ubuntu_sso/gtk/tests/test_gui.py (+0/-2291)
ubuntu_sso/gtk/tests/test_main.py (+0/-51)
ubuntu_sso/keyring/__init__.py (+9/-3)
ubuntu_sso/keyring/linux.py (+10/-5)
ubuntu_sso/main/__init__.py (+0/-2)
ubuntu_sso/main/darwin.py (+3/-17)
ubuntu_sso/main/glib.py (+9/-9)
ubuntu_sso/main/tests/test_windows.py (+0/-13)
ubuntu_sso/main/windows.py (+3/-11)
ubuntu_sso/networkstate/tests/run_nwmgr_standalone.py (+2/-1)
ubuntu_sso/qt/__init__.py (+0/-1)
ubuntu_sso/qt/loadingoverlay.py (+1/-1)
ubuntu_sso/qt/setup_account_page.py (+2/-2)
ubuntu_sso/qt/tests/show_gui.py (+0/-2)
ubuntu_sso/tests/__init__.py (+1/-1)
ubuntu_sso/tests/test_account.py (+2/-2)
ubuntu_sso/tests/test_credentials.py (+38/-57)
ubuntu_sso/utils/__init__.py (+40/-11)
ubuntu_sso/utils/tcpactivation.py (+1/-1)
ubuntu_sso/utils/tests/test_common.py (+1/-10)
ubuntu_sso/utils/tests/test_parse_args.py (+3/-2)
ubuntu_sso/utils/tests/test_tcpactivation.py (+7/-5)
ubuntu_sso/utils/webclient/common.py (+22/-16)
ubuntu_sso/utils/webclient/qtnetwork.py (+1/-1)
ubuntu_sso/utils/webclient/restful.py (+8/-2)
ubuntu_sso/utils/webclient/tests/test_restful.py (+11/-5)
ubuntu_sso/utils/webclient/tests/test_webclient.py (+14/-8)
ubuntu_sso/utils/webclient/txweb.py (+10/-4)
To merge this branch: bzr merge lp://staging/~dobey/ubuntu-sso-client/update-4-0
Reviewer Review Type Date Requested Status
Alejandro J. Cura (community) trivial Approve
Review via email: mp+115606@code.staging.launchpad.net

Commit message

[Mike McCracken]

    - Use dirspec get_program_path for cross-platform executable path finding.
    - use buildout-generated python wrapper to run setup.py in run-mac-tests (LP: #1023043)

[Natalia Bidart]

    - Removing everything related to the GTK+ UI (LP: #1017690).

[Brian Curtin]

    Import the StringIO class in a Python 2 and 3 way
    Try Python 3 urllib names and fall back to Python 2 as needed.
    Use Python 3's print function regardless of version.
    Convert _winreg importing to use winreg on both Python 2 and 3
    Change xrange usage to range for Python 3.

[Rodney Dawes]

    Avoid using /usr/bin/env in scripts.

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

looks just like trunk. +1

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

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

*** Running QT test suite for ubuntu_sso ***
running build
Compiled data/qt/reset_password.ui into ubuntu_sso/qt/ui/reset_password_ui.py
Compiled data/qt/proxy_credentials_dialog.ui into ubuntu_sso/qt/ui/proxy_credentials_dialog_ui.py
compiled data/qt/resources.qrc into ubuntu_sso/qt/ui/resources_rc.py
Compiled data/qt/loadingoverlay.ui into ubuntu_sso/qt/ui/loadingoverlay_ui.py
Compiled data/qt/ssl_dialog.ui into ubuntu_sso/qt/ui/ssl_dialog_ui.py
Compiled data/qt/success_message.ui into ubuntu_sso/qt/ui/success_message_ui.py
Compiled data/qt/setup_account.ui into ubuntu_sso/qt/ui/setup_account_ui.py
Compiled data/qt/current_user_sign_in.ui into ubuntu_sso/qt/ui/current_user_sign_in_ui.py
Compiled data/qt/error_message.ui into ubuntu_sso/qt/ui/error_message_ui.py
Compiled data/qt/forgotten_password.ui into ubuntu_sso/qt/ui/forgotten_password_ui.py
Compiled data/qt/network_detection.ui into ubuntu_sso/qt/ui/network_detection_ui.py
Compiled data/qt/email_verification.ui into ubuntu_sso/qt/ui/email_verification_ui.py
running build_py
creating build
creating build/lib.linux-x86_64-2.7
creating build/lib.linux-x86_64-2.7/ubuntu_sso
copying ubuntu_sso/credentials.py -> build/lib.linux-x86_64-2.7/ubuntu_sso
copying ubuntu_sso/account.py -> build/lib.linux-x86_64-2.7/ubuntu_sso
copying ubuntu_sso/__init__.py -> build/lib.linux-x86_64-2.7/ubuntu_sso
copying ubuntu_sso/logger.py -> build/lib.linux-x86_64-2.7/ubuntu_sso
creating build/lib.linux-x86_64-2.7/ubuntu_sso/tests
copying ubuntu_sso/tests/test_account.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/tests
copying ubuntu_sso/tests/linux.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/tests
copying ubuntu_sso/tests/test_credentials.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/tests
copying ubuntu_sso/tests/__init__.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/tests
creating build/lib.linux-x86_64-2.7/ubuntu_sso/keyring
copying ubuntu_sso/keyring/pykeyring.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/keyring
copying ubuntu_sso/keyring/linux.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/keyring
copying ubuntu_sso/keyring/__init__.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/keyring
creating build/lib.linux-x86_64-2.7/ubuntu_sso/keyring/tests
copying ubuntu_sso/keyring/tests/__init__.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/keyring/tests
copying ubuntu_sso/keyring/tests/test_pykeyring.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/keyring/tests
copying ubuntu_sso/keyring/tests/test_common.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/keyring/tests
copying ubuntu_sso/keyring/tests/test_linux.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/keyring/tests
creating build/lib.linux-x86_64-2.7/ubuntu_sso/main
copying ubuntu_sso/main/perspective_broker.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/main
copying ubuntu_sso/main/glib.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/main
copying ubuntu_sso/main/linux.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/main
copying ubuntu_sso/main/darwin.py -> build/lib.linux-x86_64-2.7/ubuntu_sso/main
copying ubuntu_sso/main/qt.py -> build/lib.linux-x...

lp://staging/~dobey/ubuntu-sso-client/update-4-0 updated
962. By Brian Curtin

[Mike McCracken]

    - Use dirspec get_program_path for cross-platform executable path finding.
    - use buildout-generated python wrapper to run setup.py in run-mac-tests (LP: #1023043)

[Natalia Bidart]

    - Removing everything related to the GTK+ UI (LP: #1017690).

[Brian Curtin]

    Import the StringIO class in a Python 2 and 3 way
    Try Python 3 urllib names and fall back to Python 2 as needed.
    Use Python 3's print function regardless of version.
    Convert _winreg importing to use winreg on both Python 2 and 3
    Change xrange usage to range for Python 3.

[Rodney Dawes]

    Avoid using /usr/bin/env in scripts.

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: