From: Ben Darnell <ben@bendarnell.com>
Date: Sun, 26 Feb 2012 00:50:51 +0000 (-0800)
Subject: Don't swallow exceptions that escape from TestCase.run().
X-Git-Tag: v2.3.0~76
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=94dc4c78e8713d0da6c31e65cfa0776a8768c936;p=thirdparty%2Ftornado.git

Don't swallow exceptions that escape from TestCase.run().

This fixes a case in which nose would fail to report a failing test
(if the exception's str() method raised an exception).

Closes #466.
---

diff --git a/tornado/testing.py b/tornado/testing.py
index 2905d91d4..b06d149c1 100644
--- a/tornado/testing.py
+++ b/tornado/testing.py
@@ -138,9 +138,24 @@ class AsyncTestCase(unittest.TestCase):
             self.__failure = sys.exc_info()
             self.stop()
 
+    def __rethrow(self):
+        if self.__failure is not None:
+            failure = self.__failure
+            self.__failure = None
+            # 2to3 isn't smart enough to convert three-argument raise
+            # statements correctly in some cases.
+            if isinstance(failure[1], failure[0]):
+                raise failure[1], None, failure[2]
+            else:
+                raise failure[0], failure[1], failure[2]
+
+
     def run(self, result=None):
         with StackContext(self._stack_context):
             super(AsyncTestCase, self).run(result)
+        # In case an exception escaped super.run or the StackContext caught
+        # an exception when there wasn't a wait() to re-raise it, do so here.
+        self.__rethrow()
 
     def stop(self, _arg=None, **kwargs):
         '''Stops the ioloop, causing one pending (or future) call to wait()
@@ -189,13 +204,7 @@ class AsyncTestCase(unittest.TestCase):
                     break
         assert self.__stopped
         self.__stopped = False
-        if self.__failure is not None:
-            # 2to3 isn't smart enough to convert three-argument raise
-            # statements correctly in some cases.
-            if isinstance(self.__failure[1], self.__failure[0]):
-                raise self.__failure[1], None, self.__failure[2]
-            else:
-                raise self.__failure[0], self.__failure[1], self.__failure[2]
+        self.__rethrow()
         result = self.__stop_args
         self.__stop_args = None
         return result