Merge lp://qastaging/~dobey/desktopcouch/back-to-testtools into lp://qastaging/desktopcouch
Proposed by
dobey
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | dobey | ||||
| Approved revision: | 241 | ||||
| Merged at revision: | 241 | ||||
| Proposed branch: | lp://qastaging/~dobey/desktopcouch/back-to-testtools | ||||
| Merge into: | lp://qastaging/desktopcouch | ||||
| Diff against target: |
12 lines (+1/-1) 1 file modified
desktopcouch/records/tests/test_server.py (+1/-1) |
||||
| To merge this branch: | bzr merge lp://qastaging/~dobey/desktopcouch/back-to-testtools | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Natalia Bidart (community) | Approve | ||
| Manuel de la Peña (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Switch back to testtools for a few tests as it seems fixed for python2.7 now
Description of the change
To test this, you can run "python2.6 u1trial desktopcouch" to check that tests still pass on 2.6, if you're on narwhal which defaults to 2.7.
To post a comment you must log in.
Revision history for this message
| Natalia Bidart (nataliabidart) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
+1