Fixed issue 269

1 files changed, 15 insertions, 0 deletions

diff --git a/nose/loader.py b/nose/loader.py
index 969aac2..a4b8633 100644
--- a/nose/loader.py
+++ b/nose/loader.py
@@ -481,6 +481,21 @@ class TestLoader(unittest.TestLoader):
         return self.suiteClass(ContextList(cases, context=cls))
 
     def makeTest(self, obj, parent=None):
+        try:
+            return self._makeTest(obj, parent)
+        except (KeyboardInterrupt, SystemExit):
+            raise
+        except:
+            exc = sys.exc_info()
+            try:
+                addr = test_address(obj)
+            except KeyboardInterrupt:
+                raise
+            except:
+                addr = None
+            return Failure(exc[0], exc[1], exc[2], address=addr)
+    
+    def _makeTest(self, obj, parent=None):
         """Given a test object and its parent, return a test case
         or test suite.
         """