Merge lp://staging/~gmb/zope.testing/argh-argh-argh into lp://staging/~launchpad/zope.testing/3.9.4-fork
Proposed by
Graham Binns
| Status: | Merged |
|---|---|
| Approved by: | Graham Binns |
| Approved revision: | 52 |
| Merged at revision: | 49 |
| Proposed branch: | lp://staging/~gmb/zope.testing/argh-argh-argh |
| Merge into: | lp://staging/~launchpad/zope.testing/3.9.4-fork |
| Diff against target: |
109 lines (+34/-9) 3 files modified
setup.py (+1/-1) src/zope/testing/testrunner/runner.py (+6/-4) src/zope/testing/testrunner/test_testresult.py (+27/-4) |
| To merge this branch: | bzr merge lp://staging/~gmb/zope.testing/argh-argh-argh |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Benji York (community) | code | Approve | |
|
Review via email:
|
|||
Commit message
Update our Python 2.7-compatible code so that it falls back to existing behaviour when run under 2.6. Also bump the patch number to avoid anyone with a stale bad version of p16 in their download-cache from getting knobbled.
Description of the change
This branch tweaks our Python 2.7 compatibility code so that it doesn't break the test suite under Python 2.6.
Previously, we allowed addSkip() to do its thing under Python 2.6. aside from calling up to its parent class. However, existing behaviour is to just call addSuccess() when skipping tests under 2.6, so we decided to preserve that behaviour.
To post a comment you must log in.
Revision history for this message
| Launchpad QA Bot (lpqabot) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
This branch looks good. I think you have a typo, shouldn't "2.6" be "2.7" in the below comment?
# This test can go away once we're only using Python 2.6