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)
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.