From e399785a97283b42c3f7f1ff44cbb737907b3115 Mon Sep 17 00:00:00 2001 From: Markus Lampert Date: Tue, 20 Jun 2017 14:06:15 -0700 Subject: [PATCH] Disable exception catching in tests to figure out why TestPathApp cannot be imported on the build system. --- src/Mod/Path/TestPathApp.py | 1 + src/Mod/Test/TestApp.py | 28 ++++++++++++++-------------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/Mod/Path/TestPathApp.py b/src/Mod/Path/TestPathApp.py index f32af9a985..531d5b163b 100644 --- a/src/Mod/Path/TestPathApp.py +++ b/src/Mod/Path/TestPathApp.py @@ -31,3 +31,4 @@ from PathTests.TestPathGeom import TestPathGeom from PathTests.TestPathUtil import TestPathUtil from PathTests.TestPathDepthParams import depthTestCases from PathTests.TestPathDressupHoldingTags import TestHoldingTags + diff --git a/src/Mod/Test/TestApp.py b/src/Mod/Test/TestApp.py index e4b5c8d440..0c9ee7ecb2 100644 --- a/src/Mod/Test/TestApp.py +++ b/src/Mod/Test/TestApp.py @@ -34,24 +34,24 @@ import unittest def tryLoadingTest(testName): "Loads and returns testName, or a failing TestCase if unsuccessful." - try: - return unittest.defaultTestLoader.loadTestsFromName(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 + #except ImportError as err: + # 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 __name__(self): + # return "Loading " + self.testName - def _runTest(self): - self.fail("Couldn't load " + self.testName) + # def _runTest(self): + # self.fail("Couldn't load " + self.testName) - return LoadFailed(testName) + # return LoadFailed(testName) def All(): # Base system tests