Merge lp://qastaging/~dobey/ubuntu-sso-client/twisted-14-fixes into lp://qastaging/ubuntu-sso-client
Proposed by
dobey
| Status: | Merged |
|---|---|
| Approved by: | dobey |
| Approved revision: | 1036 |
| Merged at revision: | 1036 |
| Proposed branch: | lp://qastaging/~dobey/ubuntu-sso-client/twisted-14-fixes |
| Merge into: | lp://qastaging/ubuntu-sso-client |
| Diff against target: |
45 lines (+6/-2) 2 files modified
ubuntu_sso/main/tests/test_common.py (+2/-0) ubuntu_sso/utils/webclient/tests/test_webclient.py (+4/-2) |
| To merge this branch: | bzr merge lp://qastaging/~dobey/ubuntu-sso-client/twisted-14-fixes |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Natalia Bidart (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Fix tests to work properly and under twisted 14.
Description of the change
With twisted 14.0.0, trial will error out on tests that are calling yield, but are not wrapped with defer. Some tests were broken in this regard, and passing when they shouldn't have been. This fixes those tests.
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
Looks good!