testtools-dev team mailing list archive
-
testtools-dev team
-
Mailing list archive
-
Message #00526
[Merge] lp:~jelmer/testtools/unittest2 into lp:testtools
Jelmer Vernooij has proposed merging lp:~jelmer/testtools/unittest2 into lp:testtools.
Requested reviews:
testtools developers (testtools-dev)
For more details, see:
https://code.launchpad.net/~jelmer/testtools/unittest2/+merge/45802
This makes testtools try to use the unittest2 TestSkipped, _UnexpectedSuccess, etc classes if unittest doesn't provide them.
This should make it a bit easier to use testtools and subunit in combination with projects that support unittest2.
--
https://code.launchpad.net/~jelmer/testtools/unittest2/+merge/45802
Your team testtools developers is requested to review the proposed merge of lp:~jelmer/testtools/unittest2 into lp:testtools.
=== modified file 'NEWS'
--- NEWS 2010-12-29 18:11:12 +0000
+++ NEWS 2011-01-11 01:08:54 +0000
@@ -23,6 +23,8 @@
* Vastly improved and extended documentation. (Jonathan Lange)
+* Use unittest2 exception classes if available. (Jelmer Vernooij)
+
0.9.8
~~~~~
=== modified file 'testtools/testcase.py'
--- testtools/testcase.py 2010-12-12 04:11:39 +0000
+++ testtools/testcase.py 2011-01-11 01:08:54 +0000
@@ -35,6 +35,7 @@
class TestSkipped(Exception):
"""Raised within TestCase.run() when a test is skipped."""
+testSkipped = try_import('unittest2.case.SkipTest', TestSkipped)
TestSkipped = try_import('unittest.case.SkipTest', TestSkipped)
@@ -45,6 +46,8 @@
module.
"""
_UnexpectedSuccess = try_import(
+ 'unittest2.case._UnexpectedSuccess', _UnexpectedSuccess)
+_UnexpectedSuccess = try_import(
'unittest.case._UnexpectedSuccess', _UnexpectedSuccess)
class _ExpectedFailure(Exception):
@@ -54,6 +57,8 @@
module.
"""
_ExpectedFailure = try_import(
+ 'unittest2.case._ExpectedFailure', _ExpectedFailure)
+_ExpectedFailure = try_import(
'unittest.case._ExpectedFailure', _ExpectedFailure)
Follow ups