Merge lp://staging/~nataliabidart/ubuntu/natty/ubuntu-sso-client/ubuntu-sso-client-1.1.12 into lp://staging/ubuntu/natty/ubuntu-sso-client
Proposed by
Natalia Bidart
| Status: | Merged |
|---|---|
| Merged at revision: | 27 |
| Proposed branch: | lp://staging/~nataliabidart/ubuntu/natty/ubuntu-sso-client/ubuntu-sso-client-1.1.12 |
| Merge into: | lp://staging/ubuntu/natty/ubuntu-sso-client |
| Diff against target: |
6817 lines (+3866/-2670) 35 files modified
PKG-INFO (+1/-1) debian/changelog (+19/-0) run-tests (+1/-1) run-tests.bat (+64/-0) setup.py (+4/-2) ubuntu_sso/account.py (+7/-4) ubuntu_sso/gtk/gui.py (+8/-10) ubuntu_sso/gtk/tests/test_gui.py (+1/-6) ubuntu_sso/keyring.py (+0/-188) ubuntu_sso/keyring/__init__.py (+90/-0) ubuntu_sso/keyring/linux.py (+141/-0) ubuntu_sso/keyring/tests/__init__.py (+17/-0) ubuntu_sso/keyring/tests/test_linux.py (+259/-0) ubuntu_sso/keyring/tests/test_windows.py (+62/-0) ubuntu_sso/keyring/windows.py (+60/-0) ubuntu_sso/main.py (+0/-604) ubuntu_sso/main/__init__.py (+375/-0) ubuntu_sso/main/linux.py (+486/-0) ubuntu_sso/main/tests/__init__.py (+17/-0) ubuntu_sso/main/tests/test_common.py (+245/-0) ubuntu_sso/main/tests/test_linux.py (+1306/-0) ubuntu_sso/main/tests/test_windows.py (+17/-0) ubuntu_sso/main/windows.py (+17/-0) ubuntu_sso/networkstate.py (+0/-108) ubuntu_sso/networkstate/__init__.py (+40/-0) ubuntu_sso/networkstate/linux.py (+108/-0) ubuntu_sso/networkstate/tests/__init__.py (+17/-0) ubuntu_sso/networkstate/tests/test_linux.py (+181/-0) ubuntu_sso/networkstate/tests/test_windows.py (+119/-0) ubuntu_sso/networkstate/windows.py (+199/-0) ubuntu_sso/tests/bin/show_nm_state (+1/-1) ubuntu_sso/tests/test_account.py (+4/-2) ubuntu_sso/tests/test_keyring.py (+0/-258) ubuntu_sso/tests/test_main.py (+0/-1304) ubuntu_sso/tests/test_networkstate.py (+0/-181) |
| To merge this branch: | bzr merge lp://staging/~nataliabidart/ubuntu/natty/ubuntu-sso-client/ubuntu-sso-client-1.1.12 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu Sponsors | Pending | ||
|
Review via email:
|
|||
Description of the change
* New upstream release:
[ Natalia B. Bidart <email address hidden> ]
- Tests for a particular package are now inside that package.
- Register now uses the 'displayname' field to pass it on to SSO as
display name (LP: #709494).
[ Manuel de la Pena <email address hidden> ]
- Fix main issues.
- First step of implementing the code in main on windows.
- Fixed setup.py issues so that we can build .debs (LP: #735383).
- Added the network status implementation for windows (LP: #727680).
- Added an implementation of the keyring on windows (LP: #684967).
- Added script to run tests on windows using u1trial (LP: #684988).
- Added bat to run tests on windows (LP: #684988).
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
