From d4da536d4c4623bf5c795c8b82cbd438bf490f11 Mon Sep 17 00:00:00 2001 From: Markus Lampert Date: Fri, 27 Jan 2017 23:22:18 -0800 Subject: [PATCH] Restored exception masking - although i'm not sure it's a good thing. --- src/Mod/Test/TestApp.py | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/Mod/Test/TestApp.py b/src/Mod/Test/TestApp.py index e3dc7440d92c..e4b5c8d4404b 100644 --- a/src/Mod/Test/TestApp.py +++ b/src/Mod/Test/TestApp.py @@ -34,24 +34,24 @@ def tryLoadingTest(testName): "Loads and returns testName, or a failing TestCase if unsuccessful." -# try: - return unittest.defaultTestLoader.loadTestsFromName(testName) - -# except ImportError: -# class LoadFailed(unittest.TestCase): -# def __init__(self, testName): -# # setattr() first, because TestCase ctor checks for methodName. -# setattr(self, "failed_to_load_" + testName, self._runTest) -# super(LoadFailed, self).__init__("failed_to_load_" + testName) -# self.testName = testName -# -# def __name__(self): -# return "Loading " + self.testName -# -# def _runTest(self): -# self.fail("Couldn't load " + self.testName) -# -# return LoadFailed(testName) + try: + return unittest.defaultTestLoader.loadTestsFromName(testName) + + except ImportError: + class LoadFailed(unittest.TestCase): + def __init__(self, testName): + # setattr() first, because TestCase ctor checks for methodName. + setattr(self, "failed_to_load_" + testName, self._runTest) + super(LoadFailed, self).__init__("failed_to_load_" + testName) + self.testName = testName + + def __name__(self): + return "Loading " + self.testName + + def _runTest(self): + self.fail("Couldn't load " + self.testName) + + return LoadFailed(testName) def All(): # Base system tests