Commits

Anonymous committed d4aa0b5

prevent hangs in test suite when a test failed with Python 2.7 (patch by Martin Bacovsky, Fedora/Red Hat)

Comments (0)

Files changed (1)

cherrypy/test/webtest.py

                 except (KeyboardInterrupt, SystemExit):
                     raise
                 except:
-                    result.addError(self, self._exc_info())
+                    result.addError(self, sys.exc_info())
                     return
                 
                 ok = 0
                     testMethod()
                     ok = 1
                 except self.failureException:
-                    result.addFailure(self, self._exc_info())
+                    result.addFailure(self, sys.exc_info())
                 except (KeyboardInterrupt, SystemExit):
                     raise
                 except:
-                    result.addError(self, self._exc_info())
+                    result.addError(self, sys.exc_info())
                 
                 try:
                     self.tearDown()
                 except (KeyboardInterrupt, SystemExit):
                     raise
                 except:
-                    result.addError(self, self._exc_info())
+                    result.addError(self, sys.exc_info())
                     ok = 0
                 if ok:
                     result.addSuccess(self)