From a787395ca9cc5dae5aa32953d0f6a4f2100ae71d Mon Sep 17 00:00:00 2001
From: Bernd Hahnebach <bernd@bimstatik.org>
Date: Fri, 22 May 2020 08:02:10 +0200
Subject: [PATCH] FEM: unit tests, reactivate unit test, do not run the test
 which do not pass on Python 2

---
 src/Mod/Fem/TestFem.py                   | 3 ---
 src/Mod/Fem/femtest/app/test_ccxtools.py | 7 +++++--
 src/Mod/Fem/femtest/app/test_open.py     | 7 ++++++-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/Mod/Fem/TestFem.py b/src/Mod/Fem/TestFem.py
index f7c5d773d11a..84af8e068ca7 100644
--- a/src/Mod/Fem/TestFem.py
+++ b/src/Mod/Fem/TestFem.py
@@ -25,7 +25,6 @@
 
 # Unit test for the FEM module
 # to get the right order import as is used
-"""
 from femtest.app.test_femimport import TestFemImport as FemTest01
 from femtest.app.test_common import TestFemCommon as FemTest02
 from femtest.app.test_object import TestObjectCreate as FemTest03
@@ -50,7 +49,6 @@
 False if FemTest09.__name__ else True
 False if FemTest10.__name__ else True
 False if FemTest11.__name__ else True
-"""
 
 # For more information on how to run a specific test class or a test method see
 # file src/Mod/Test/__init__
@@ -60,7 +58,6 @@
 # in tearDown method to not close the document
 
 
-"""
 # examples from within FreeCAD:
 
 # create all objects test
diff --git a/src/Mod/Fem/femtest/app/test_ccxtools.py b/src/Mod/Fem/femtest/app/test_ccxtools.py
index 381114eb1a6e..6b2ff5bd0f5f 100644
--- a/src/Mod/Fem/femtest/app/test_ccxtools.py
+++ b/src/Mod/Fem/femtest/app/test_ccxtools.py
@@ -26,6 +26,7 @@
 __author__ = "Bernd Hahnebach"
 __url__ = "http://www.freecadweb.org"
 
+import sys
 import unittest
 from os.path import join
 
@@ -174,6 +175,10 @@ def test_static_constraint_contact_shell_shell(
     def test_static_constraint_contact_solid_solid(
         self
     ):
+        # TODO does not pass on Python 2
+        if sys.version_info.major < 3:
+            return
+
         # set up
         from femexamples.constraint_contact_solid_solid import setup
         setup(self.document, "ccxtools")
@@ -184,14 +189,12 @@ def test_static_constraint_contact_solid_solid(
             "FEM_ccx_constraint_contact_solid_solid",
         )
 
-        """
         # test input file writing
         self.input_file_writing_test(
             test_name=test_name,
             base_name=base_name,
             analysis_dir=analysis_dir,
         )
-        """
 
     # ********************************************************************************************
     def test_static_constraint_tie(
diff --git a/src/Mod/Fem/femtest/app/test_open.py b/src/Mod/Fem/femtest/app/test_open.py
index c5bd9f23ed1e..1066b2a63b8f 100644
--- a/src/Mod/Fem/femtest/app/test_open.py
+++ b/src/Mod/Fem/femtest/app/test_open.py
@@ -25,8 +25,9 @@
 __author__ = "Bernd Hahnebach"
 __url__ = "http://www.freecadweb.org"
 
-import unittest
+import sys
 import tempfile
+import unittest
 from os.path import join
 
 import FreeCAD
@@ -110,6 +111,10 @@ def test_femobjects_open_head(
     def test_femobjects_open_de9b3fb438(
         self
     ):
+        # migration modules do not import on Python 2 thus this can not work
+        if sys.version_info.major < 3:
+            return
+
         # the number in method name is the FreeCAD commit the document was created with
         # https://github.com/FreeCAD/FreeCAD/commit/de9b3fb438
         # the document was created by running the object create unit test