From 9f689bef4582af2f4078f90c1fd73f47e0dc7dbd Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Thu, 28 Mar 2019 20:33:10 +0100 Subject: [PATCH] FEM: unit tests, do not use join on module import test --- src/Mod/Fem/femtest/testcommon.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/Mod/Fem/femtest/testcommon.py b/src/Mod/Fem/femtest/testcommon.py index 5cec53819c..f73d42ccce 100644 --- a/src/Mod/Fem/femtest/testcommon.py +++ b/src/Mod/Fem/femtest/testcommon.py @@ -68,19 +68,22 @@ class TestFemCommon(unittest.TestCase): # collect all Python modules in Fem pymodules += testtools.collect_python_modules('') # Fem main dir + pymodules += testtools.collect_python_modules('femexamples') pymodules += testtools.collect_python_modules('feminout') pymodules += testtools.collect_python_modules('femmesh') + pymodules += testtools.collect_python_modules('femobjects') pymodules += testtools.collect_python_modules('femresult') pymodules += testtools.collect_python_modules('femtest') - pymodules += testtools.collect_python_modules('femobjects') + pymodules += testtools.collect_python_modules('femtools') + pymodules += testtools.collect_python_modules('femsolver') + # TODO test with join on windows, the use of os.path.join in following code seams to make problems on windws os + pymodules += testtools.collect_python_modules('femsolver/elmer') + pymodules += testtools.collect_python_modules('femsolver/elmer/equations') + pymodules += testtools.collect_python_modules('femsolver/z88') + pymodules += testtools.collect_python_modules('femsolver/calculix') if FreeCAD.GuiUp: pymodules += testtools.collect_python_modules('femcommands') pymodules += testtools.collect_python_modules('femguiobjects') - pymodules += testtools.collect_python_modules('femsolver') - pymodules += testtools.collect_python_modules(join('femsolver', 'elmer')) - pymodules += testtools.collect_python_modules(join('femsolver', 'elmer', 'equations')) - pymodules += testtools.collect_python_modules(join('femsolver', 'z88')) - pymodules += testtools.collect_python_modules(join('femsolver', 'calculix')) # import all collected modules # fcc_print(pymodules)