Merge lp://staging/~canonical-isd-hackers/canonical-identity-provider/721318-enhance-merge into lp://staging/~canonical-isd-hackers/canonical-identity-provider/stable
| Status: | Merged |
|---|---|
| Approved by: | Ricardo Kirkner |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 95 |
| Proposed branch: | lp://staging/~canonical-isd-hackers/canonical-identity-provider/721318-enhance-merge |
| Merge into: | lp://staging/~canonical-isd-hackers/canonical-identity-provider/stable |
| Diff against target: |
90 lines (+32/-13) 3 files modified
identityprovider/bin/accounts_merge.py (+23/-9) identityprovider/models/account.py (+2/-2) wsgiserver.py (+7/-2) |
| To merge this branch: | bzr merge lp://staging/~canonical-isd-hackers/canonical-identity-provider/721318-enhance-merge |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Michael Nelson (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Display a more informative error message when the source account has been used to log in to RPs, and display those RPs.
Description of the change
Added a more informative error message when the source account has been used to log in to RPs, also explaining that this is a problem because any accounts at those RPs will become inaccessible by the user. Also, display a list of the RPs so the action can be verified with the user.
During testing, the test consumer would block when making an API call---the WSGI server was serving only a single request at a time. This is strange because I thought the wsgiserver script was added in order to run multi-threaded to test the test consumer. Nevertheless, all the docs I could find seemed to indicate it was single-threaded, single-process, not select-based, &c., unless explicitly configured to be so.
| David Owen (dsowen) wrote | # |
Set to merge into stable as this is needed in production to satisfy a pending RT.