Merge lp://staging/~dobey/ubuntu-sso-client/testable-env into lp://staging/ubuntu-sso-client
Proposed by
dobey
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | dobey | ||||
| Approved revision: | 1027 | ||||
| Merged at revision: | 1026 | ||||
| Proposed branch: | lp://staging/~dobey/ubuntu-sso-client/testable-env | ||||
| Merge into: | lp://staging/ubuntu-sso-client | ||||
| Diff against target: |
141 lines (+20/-16) 5 files modified
ubuntu_sso/__init__.py (+8/-2) ubuntu_sso/account.py (+3/-5) ubuntu_sso/qt/sso_wizard_page.py (+5/-5) ubuntu_sso/utils/webclient/qtnetwork.py (+1/-2) ubuntu_sso/utils/webclient/timestamp.py (+3/-2) |
||||
| To merge this branch: | bzr merge lp://staging/~dobey/ubuntu-sso-client/testable-env | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Brian Curtin (community) | Approve | ||
| Mike McCracken (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Unify usage of login and u1 host into environment variables, for testing.
Description of the change
This replaces usage of login.ubuntu.com in URLs with the value of $SSO_AUTH_HOST which defaults to login.ubuntu.com, and usage of one.ubuntu.com with value of $SSO_UONE_HOST which defaults to one.ubuntu.com.
To post a comment you must log in.
Revision history for this message
| Brian Curtin (brian.curtin) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
tests pass on osx and linux, verified that the env vars do appear to work for me.