1 new commit in pytest:
https://bitbucket.org/hpk42/pytest/changeset/16af87f5ea63/ changeset: 16af87f5ea63 user: hpk42 date: 2011-11-18 17:34:46 summary: fix compat with testcases from trial-11.1.0 affected #: 2 files diff -r e776739a7800d45ba9e55c91ad33827a16b90420 -r 16af87f5ea632158d618774caa93efc71879daee CHANGELOG --- a/CHANGELOG +++ b/CHANGELOG @@ -28,6 +28,7 @@ - fix and cleanup pytest's own test suite to not leak FDs - fix issue83: link to generated funcarg list - fix issue74: pyarg module names are now checked against imp.find_module false positives +- fix compatibility with twisted/trial-11.1.0 use cases Changes between 2.1.2 and 2.1.3 ---------------------------------------- diff -r e776739a7800d45ba9e55c91ad33827a16b90420 -r 16af87f5ea632158d618774caa93efc71879daee _pytest/unittest.py --- a/_pytest/unittest.py +++ b/_pytest/unittest.py @@ -120,14 +120,19 @@ ut = sys.modules['twisted.python.failure'] Failure__init__ = ut.Failure.__init__.im_func check_testcase_implements_trial_reporter() - def excstore(self, exc_value=None, exc_type=None, exc_tb=None): + def excstore(self, exc_value=None, exc_type=None, exc_tb=None, + captureVars=None): if exc_value is None: self._rawexcinfo = sys.exc_info() else: if exc_type is None: exc_type = type(exc_value) self._rawexcinfo = (exc_type, exc_value, exc_tb) - Failure__init__(self, exc_value, exc_type, exc_tb) + try: + Failure__init__(self, exc_value, exc_type, exc_tb, + captureVars=captureVars) + except TypeError: + Failure__init__(self, exc_value, exc_type, exc_tb) ut.Failure.__init__ = excstore try: return __multicall__.execute() Repository URL: https://bitbucket.org/hpk42/pytest/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. _______________________________________________ py-svn mailing list py-svn@codespeak.net http://codespeak.net/mailman/listinfo/py-svn
