Fix MEDCoupling tests currently failing on Windows OS:

   1/ fix import in python scripts
   2/ fix PYTHONPATH search path in CTestTestfileInstall.cmake consistently for Windows
   3/ Implement Linux which equivalent command on Windows

Taking into account code review as discussed in this pull request: https://codev-tuleap.cea.fr/plugins/git/?action=pull-requests&repo_id=146&group_id=116#/pull-requests/2456/overview

diff --git a/src/MEDCoupling_Swig/MEDCouplingBasicsTest1.py b/src/MEDCoupling_Swig/MEDCouplingBasicsTest1.py
index 2dd2abcc6e74d6e5b6612ae23b7df810438dd0ac..f834e7590afb5538a5f197f85d14a7cd778144ea 100644 (file)
--- a/src/MEDCoupling_Swig/MEDCouplingBasicsTest1.py
+++ b/src/MEDCoupling_Swig/MEDCouplingBasicsTest1.py
@@ -19,10 +19,7 @@
 #
 
 import sys
-if sys.platform == "win32":
-    from MEDCouplingCompat import *
-else:
-    from medcoupling import *
+from medcoupling import *
 
 import unittest
 from math import pi,e,sqrt,cos,sin

diff --git a/src/MEDCoupling_Swig/MEDCouplingBasicsTest2.py b/src/MEDCoupling_Swig/MEDCouplingBasicsTest2.py
index ef75ebf43535919c5fd553b9187af3700a1c9415..6018ba3f1db31ca917148a6b84a127b078f438a3 100644 (file)
--- a/src/MEDCoupling_Swig/MEDCouplingBasicsTest2.py
+++ b/src/MEDCoupling_Swig/MEDCouplingBasicsTest2.py
@@ -20,10 +20,7 @@
 
 
 import sys
-if sys.platform == "win32":
-    from MEDCouplingCompat import *
-else:
-    from medcoupling import *
+from medcoupling import *
 import unittest
 from math import pi,e,sqrt,cos,sin
 from datetime import datetime

diff --git a/src/MEDCoupling_Swig/MEDCouplingBasicsTest3.py b/src/MEDCoupling_Swig/MEDCouplingBasicsTest3.py
index ef24dfb421632373f54b4866d88eb6ebcd3fa302..59e0c83c3eb3dcb47b7c2cd0b704c049a4cf3fff 100644 (file)
--- a/src/MEDCoupling_Swig/MEDCouplingBasicsTest3.py
+++ b/src/MEDCoupling_Swig/MEDCouplingBasicsTest3.py
@@ -19,10 +19,7 @@
 #
 
 import sys
-if sys.platform == "win32":
-    from MEDCouplingCompat import *
-else:
-    from medcoupling import *
+from medcoupling import *
 import unittest
 from math import pi,e,sqrt,cos,sin
 from datetime import datetime

diff --git a/src/MEDCoupling_Swig/MEDCouplingBasicsTest4.py b/src/MEDCoupling_Swig/MEDCouplingBasicsTest4.py
index b2850aca8ad9b0ef5c97cfb50047a241fdda832e..443a957e11b38fbe54c3873004c8c45c0c3a7cb6 100644 (file)
--- a/src/MEDCoupling_Swig/MEDCouplingBasicsTest4.py
+++ b/src/MEDCoupling_Swig/MEDCouplingBasicsTest4.py
@@ -20,10 +20,7 @@
 
 
 import sys
-if sys.platform == "win32":
-    from MEDCouplingCompat import *
-else:
-    from medcoupling import *
+from medcoupling import *
 import unittest
 from math import pi,e,sqrt,cos,sin
 from datetime import datetime

diff --git a/src/MEDCoupling_Swig/MEDCouplingBasicsTest5.py b/src/MEDCoupling_Swig/MEDCouplingBasicsTest5.py
index 58fba2e0237324521435429fd070472660ef3cbb..c8864d1bac11b4ab395ea9f01f474eb02e85f356 100644 (file)
--- a/src/MEDCoupling_Swig/MEDCouplingBasicsTest5.py
+++ b/src/MEDCoupling_Swig/MEDCouplingBasicsTest5.py
@@ -19,10 +19,7 @@
 #
 
 import sys
-if sys.platform == "win32":
-    from MEDCouplingCompat import *
-else:
-    from medcoupling import *
+from medcoupling import *
 
 import unittest
 from math import pi,e,sqrt,cos,sin

diff --git a/src/MEDCoupling_Swig/MEDCouplingBasicsTest6.py b/src/MEDCoupling_Swig/MEDCouplingBasicsTest6.py
index dacf44203f1dc0304c35306de0eab4df5544a12b..38ffb06c4df975bbe88df779bbe5a951c8394a2e 100644 (file)
--- a/src/MEDCoupling_Swig/MEDCouplingBasicsTest6.py
+++ b/src/MEDCoupling_Swig/MEDCouplingBasicsTest6.py
@@ -20,10 +20,7 @@
 
 
 import sys
-if sys.platform == "win32":
-    from MEDCouplingCompat import *
-else:
-    from medcoupling import *
+from medcoupling import *
 import unittest
 from math import pi,e,sqrt,cos,sin
 from datetime import datetime

diff --git a/src/MEDCoupling_Swig/MEDCouplingBasicsTest7.py b/src/MEDCoupling_Swig/MEDCouplingBasicsTest7.py
index 3a5cacd9f0488651cdf05a65934a554c76665c10..7f43e34b02cf55b4c8b25680791bbbb8fb31d47a 100644 (file)
--- a/src/MEDCoupling_Swig/MEDCouplingBasicsTest7.py
+++ b/src/MEDCoupling_Swig/MEDCouplingBasicsTest7.py
@@ -20,10 +20,7 @@
 
 
 import sys
-if sys.platform == "win32":
-    from MEDCouplingCompat import *
-else:
-    from medcoupling import *
+from medcoupling import *
 import unittest
 from math import pi,e,sqrt,cos,sin
 from datetime import datetime

diff --git a/src/MEDCoupling_Swig/MEDCouplingDataForTest.py b/src/MEDCoupling_Swig/MEDCouplingDataForTest.py
index 88495dd3865189bd9ed47152d0f3b3376f0f26a8..54ec15bd0ae443c2a601947531a233be75f61308 100644 (file)
--- a/src/MEDCoupling_Swig/MEDCouplingDataForTest.py
+++ b/src/MEDCoupling_Swig/MEDCouplingDataForTest.py
@@ -20,10 +20,7 @@
 
 
 import sys
-if sys.platform == "win32":
-    from MEDCouplingCompat import *
-else:
-    from medcoupling import *
+from medcoupling import *
 
 class MEDCouplingDataForTest:
     def build2DTargetMesh_1(cls):

diff --git a/src/MEDCoupling_Swig/MEDCouplingExamplesTest.py b/src/MEDCoupling_Swig/MEDCouplingExamplesTest.py
index 5cb37f82037bab808f9ca8c96392b26dc495b4f3..4175fd56b78d867782e6da5a5a48a7de60d97d7d 100644 (file)
--- a/src/MEDCoupling_Swig/MEDCouplingExamplesTest.py
+++ b/src/MEDCoupling_Swig/MEDCouplingExamplesTest.py
@@ -20,10 +20,7 @@
 
 
 import sys
-if sys.platform == "win32":
-    from MEDCouplingCompat import *
-else:
-    from medcoupling import *
+from medcoupling import *
 import unittest
 from math import pi, sqrt
 
@@ -34,6 +31,7 @@ def WriteInTmpDir(func):
         with tempfile.TemporaryDirectory() as tmpdirname:
             os.chdir(tmpdirname)
             ret = func(*args,**kwargs)
+            os.chdir(os.path.dirname(tmpdirname))
             pass
         return ret
     return decoratedFunc

diff --git a/src/MEDCoupling_Swig/MEDCouplingIntersectTest.py b/src/MEDCoupling_Swig/MEDCouplingIntersectTest.py
index 1712b314ed8a9256ff0c1609386ea35a039bb81b..f49da20ce1ef6d4122d53f0026270f77cef5ad55 100644 (file)
--- a/src/MEDCoupling_Swig/MEDCouplingIntersectTest.py
+++ b/src/MEDCoupling_Swig/MEDCouplingIntersectTest.py
@@ -20,10 +20,7 @@
 
 
 import sys
-if sys.platform == "win32":
-    from MEDCouplingCompat import *
-else:
-    from medcoupling import *
+from medcoupling import *
 import unittest
 from math import pi,e,sqrt,cos,sin
 from datetime import datetime

diff --git a/src/MEDCoupling_Swig/MEDCouplingNumPyTest.py b/src/MEDCoupling_Swig/MEDCouplingNumPyTest.py
index 2903e8fd06e1c10a4de48b7fd56293fc55f35a87..b837feb751536cf542da1c7187c9ed92f437d88e 100644 (file)
--- a/src/MEDCoupling_Swig/MEDCouplingNumPyTest.py
+++ b/src/MEDCoupling_Swig/MEDCouplingNumPyTest.py
@@ -20,10 +20,7 @@
 
 
 import sys
-if sys.platform == "win32":
-    from MEDCouplingCompat import *
-else:
-    from medcoupling import *
+from medcoupling import *
 
 if MEDCouplingHasNumPyBindings():
     from numpy import *

diff --git a/src/MEDCoupling_Swig/MEDCouplingPickleTest.py b/src/MEDCoupling_Swig/MEDCouplingPickleTest.py
index d8fbd0c48f98ea07e2de2d45e421875f73163bb6..f095af34774074da23f8dc659741a65d76008f8a 100644 (file)
--- a/src/MEDCoupling_Swig/MEDCouplingPickleTest.py
+++ b/src/MEDCoupling_Swig/MEDCouplingPickleTest.py
@@ -20,10 +20,7 @@
 
 
 import sys
-if sys.platform == "win32":
-    from MEDCouplingCompat import *
-else:
-    from medcoupling import *
+from medcoupling import *
 from MEDCouplingDataForTest import MEDCouplingDataForTest
 
 if MEDCouplingHasNumPyBindings():

diff --git a/src/MEDCoupling_Swig/UsersGuideExamplesTest.py b/src/MEDCoupling_Swig/UsersGuideExamplesTest.py
index 40d966dae1aeb6d2383ecdc031c67f9fa9e7082e..56f8121a9f02fad8ae1e2ed20afeea9da59748f9 100755 (executable)
--- a/src/MEDCoupling_Swig/UsersGuideExamplesTest.py
+++ b/src/MEDCoupling_Swig/UsersGuideExamplesTest.py
@@ -20,10 +20,7 @@
 
 
 import sys
-if sys.platform == "win32":
-    from MEDCouplingCompat import *
-else:
-    from medcoupling import *
+from medcoupling import *
 from math import pi, sqrt
 
 # ! [PySnippetUMeshStdBuild1_1]

diff --git a/src/MEDCoupling_Swig/UsersGuideExamplesTest_numpy.py b/src/MEDCoupling_Swig/UsersGuideExamplesTest_numpy.py
index 8a1bf605f17833390c64767a1fefe958e5993334..607d9992a167f5f8974808cb3ff7b5317d5d9fd3 100644 (file)
--- a/src/MEDCoupling_Swig/UsersGuideExamplesTest_numpy.py
+++ b/src/MEDCoupling_Swig/UsersGuideExamplesTest_numpy.py
@@ -18,10 +18,7 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 import sys
-if sys.platform == "win32":
-    from MEDCouplingCompat import *
-else:
-    from medcoupling import *
+from medcoupling import *
 
 from math import pi, sqrt
 

diff --git a/src/MEDLoader/Swig/MEDLoaderCouplingTrainingSession.py b/src/MEDLoader/Swig/MEDLoaderCouplingTrainingSession.py
index 703bd84f9ba9e7908c8217791124b5806a610a98..db0eeb93fd17ce3e01ed3da513f94e01f80a73cd 100644 (file)
--- a/src/MEDLoader/Swig/MEDLoaderCouplingTrainingSession.py
+++ b/src/MEDLoader/Swig/MEDLoaderCouplingTrainingSession.py
@@ -21,7 +21,7 @@
 
 from MEDLoader import *
 from MEDCouplingRemapper import *
-import math, os
+import math, sys
 import tempfile,os,shutil
 
 zeDir = tempfile.mkdtemp()
@@ -600,4 +600,6 @@ omega=sum(angle2)/(ts[-1][2]-ts[0][2])
 print(sum(angle2)) ; assert abs(sum(angle2)-1.12)<1e-2
 print("Au pdt (%d,%d) a %r s le couple est de : %r N.m, power/omega=%r N.m"%(ts[2][0],ts[2][1],ts[2][2],zeTorque[2],power/omega))
 assert abs(power/omega-0.37)<1e-2
+
+os.chdir(os.path.dirname(zeDir))
 shutil.rmtree(zeDir)

diff --git a/src/MEDLoader/Swig/MEDLoaderDataForTest.py b/src/MEDLoader/Swig/MEDLoaderDataForTest.py
index 759acc451588369cf48687a3c9abd1092da2d432..db85e76742ddd22e1eb5934317e352e346cdb261 100644 (file)
--- a/src/MEDLoader/Swig/MEDLoaderDataForTest.py
+++ b/src/MEDLoader/Swig/MEDLoaderDataForTest.py
@@ -21,6 +21,7 @@
 
 from MEDLoader import *
 from math import pi,e,sqrt
+import sys
 
 def WriteInTmpDir(func):
     def decaratedFunc(*args,**kwargs):
@@ -29,6 +30,7 @@ def WriteInTmpDir(func):
         with tempfile.TemporaryDirectory() as tmpdirname:
             os.chdir(tmpdirname)
             ret = func(*args,**kwargs)
+            os.chdir(os.path.dirname(tmpdirname))
             pass
         return ret
     return decaratedFunc

diff --git a/src/MEDLoader/Swig/UsersGuideExamplesTest_ML.py b/src/MEDLoader/Swig/UsersGuideExamplesTest_ML.py
index 2ffef81961d11529a8135184162341f506554e80..ad6f241837d96858fc00675517e94a8245c14b12 100644 (file)
--- a/src/MEDLoader/Swig/UsersGuideExamplesTest_ML.py
+++ b/src/MEDLoader/Swig/UsersGuideExamplesTest_ML.py
@@ -19,8 +19,7 @@
 #
 
 from MEDLoader import *
-import os
-import tempfile,os,shutil
+import tempfile, os, sys, shutil
 
 zeDir = tempfile.mkdtemp()
 os.chdir(zeDir)
@@ -188,4 +187,6 @@ for ff1TS in ff:
     field=ff1TS.getFieldAtLevel(ON_CELLS,level)
     field=ff1TS.getFieldOnMeshAtLevel(ON_CELLS,level,mm)
 #! [UG_RWFieldAdv_5]
+
+os.chdir(os.path.dirname(zeDir))
 shutil.rmtree(zeDir)

diff --git a/src/MEDLoader/Test/MCTestLauncher.py b/src/MEDLoader/Test/MCTestLauncher.py
index 86759b2ec942b5e8114cbf12631eadc5423c8f3c..3a0b8f254f4a5a1a7309558b99c8da9a4d470b8a 100644 (file)
--- a/src/MEDLoader/Test/MCTestLauncher.py
+++ b/src/MEDLoader/Test/MCTestLauncher.py
@@ -28,4 +28,5 @@ with tempfile.TemporaryDirectory() as tmpdirname:
     os.chdir(tmpdirname)
     p = sp.check_output(full_path)
     print(p.decode())
+    os.chdir(os.path.dirname(tmpdirname))
     pass

diff --git a/src/MEDPartitioner/Test/MEDPARTITIONERTest.cxx b/src/MEDPartitioner/Test/MEDPARTITIONERTest.cxx
index bfeb394e854e0993be30634c6f6985cef11bb028..462912b24ee74fd4e8fac17da74f53febd8df29b 100644 (file)
--- a/src/MEDPartitioner/Test/MEDPARTITIONERTest.cxx
+++ b/src/MEDPartitioner/Test/MEDPARTITIONERTest.cxx
@@ -93,13 +93,22 @@ std::string MEDPARTITIONERTest::getPartitionerExe() const
   if ( getenv("MEDCOUPLING_ROOT_DIR") )
     {
       execName=getenv("MEDCOUPLING_ROOT_DIR");  //.../INSTALL/MED
+#ifndef WIN32
       execName+="/bin/medpartitioner";
+#else
+      execName+="\\bin\\medpartitioner.exe";
+#endif
       std::ifstream my_file(execName.c_str());
       if (my_file.good())
         return execName;
     }
   execName = getcwd(NULL, 0);
+#ifndef WIN32
   execName += "/../../MEDPartitioner/medpartitioner";
+#else
+  execName += "\\..\\..\\MEDPartitioner\\medpartitioner.exe";
+#endif
+
   if (! std::ifstream(execName.c_str()))
     CPPUNIT_FAIL("Can't find medpartitioner, please set MEDCOUPLING_ROOT_DIR");
   return execName;
@@ -996,8 +1005,11 @@ void MEDPARTITIONERTest::launchMetisOrScotchMedpartitionerOnTestMeshes(std::stri
   string cmd,execName,sourceName,targetName;
 
   execName=getPartitionerExe();
-
+#ifndef WIN32
   cmd="which "+execName+" 2>/dev/null 1>/dev/null";  //no trace
+#else
+  cmd="dir "+execName+" > NUL 2>&1";  //no trace
+#endif
   res=system(cmd.c_str());
   CPPUNIT_ASSERT_EQUAL_MESSAGE(execName + " - INVALID PATH TO medpartitioner", 0, res);
 

diff --git a/src/MEDPartitioner_Swig/CTestTestfileInstall.cmake b/src/MEDPartitioner_Swig/CTestTestfileInstall.cmake
index 5b0074a1c92ce189ba795322e6aa24001678964d..9429b110991ad16ef1e910683f85ac9bd30d51bf 100644 (file)
--- a/src/MEDPartitioner_Swig/CTestTestfileInstall.cmake
+++ b/src/MEDPartitioner_Swig/CTestTestfileInstall.cmake
@@ -21,12 +21,15 @@ SET(TEST_NAMES
   MEDPartitionerTest
 )
 
+SET(PYTHONPATH $ENV{PYTHONPATH})
+CMAKE_PATH(APPEND PYTHONPATH "../../bin")
 FOREACH(tfile ${TEST_NAMES})
   SET(TEST_NAME ${COMPONENT_NAME}_${tfile})
   ADD_TEST(${TEST_NAME} python ${tfile}.py)
   SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES
     LABELS "${COMPONENT_NAME}"
     TIMEOUT ${TIMEOUT}
-    ENVIRONMENT "PYTHONPATH=../../bin:$ENV{PYTHONPATH}"
+    ENVIRONMENT "${PYTHONPATH}"
+
     )
 ENDFOREACH()

diff --git a/src/ParaMEDMEM_Swig/ParaMEDMEMTestTools.py b/src/ParaMEDMEM_Swig/ParaMEDMEMTestTools.py
index 60280d189d4cc8412a394f4bc51edb542863cab7..fff478300896467a82adc8858b9aaeb85dbd1943 100644 (file)
--- a/src/ParaMEDMEM_Swig/ParaMEDMEMTestTools.py
+++ b/src/ParaMEDMEM_Swig/ParaMEDMEMTestTools.py
@@ -21,11 +21,12 @@
 
 def WriteInTmpDir(func):
     def decaratedFunc(*args,**kwargs):
-        import tempfile,os
+        import tempfile,os, sys
         ret = None
         with tempfile.TemporaryDirectory() as tmpdirname:
             os.chdir(tmpdirname)
             ret = func(*args,**kwargs)
+            os.chdir(os.path.dirname(tmpdirname))
             pass
         return ret
     return decaratedFunc

diff --git a/src/PyWrapping/TestPyWrapGathered_medcoupling.py b/src/PyWrapping/TestPyWrapGathered_medcoupling.py
index 53a97d49220d6a4c5ffdded423b228983436dc76..a8e66ce272a025bd9e02e72795529f32b02c9421 100644 (file)
--- a/src/PyWrapping/TestPyWrapGathered_medcoupling.py
+++ b/src/PyWrapping/TestPyWrapGathered_medcoupling.py
@@ -25,11 +25,12 @@ import unittest
 
 def WriteInTmpDir(func):
     def decoratedFunc(*args,**kwargs):
-        import tempfile,os
+        import tempfile,os, sys
         ret = None
         with tempfile.TemporaryDirectory() as tmpdirname:
             os.chdir(tmpdirname)
             ret = func(*args,**kwargs)
+            os.chdir(os.path.dirname(tmpdirname))
             pass
         return ret
     return decoratedFunc

diff --git a/src/RENUMBER_Swig/CTestTestfileInstall.cmake b/src/RENUMBER_Swig/CTestTestfileInstall.cmake
index 09e57cacf3df2a67776b5a1f2b6e34abfce288e0..3543c73bf4f596d05aa1249dec83715a1c0d7083 100644 (file)
--- a/src/RENUMBER_Swig/CTestTestfileInstall.cmake
+++ b/src/RENUMBER_Swig/CTestTestfileInstall.cmake
@@ -21,13 +21,16 @@ SET(TEST_NAMES
   MEDRenumberTest
 )
 
+SET(PYTHONPATH $ENV{PYTHONPATH})
+CMAKE_PATH(APPEND PYTHONPATH "../../bin")
 FOREACH(tfile ${TEST_NAMES})
   SET(TEST_NAME ${COMPONENT_NAME}_${tfile})
   ADD_TEST(${TEST_NAME} python ${tfile}.py)
+  SET(TEST_ENVIRONMENT)
   SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES
     LABELS "${COMPONENT_NAME}"
     TIMEOUT ${TIMEOUT}
-    ENVIRONMENT "PYTHONPATH=../../bin:$ENV{PYTHONPATH}"
+    ENVIRONMENT "${PYTHONPATH}"
     )
 ENDFOREACH()
 
@@ -36,5 +39,5 @@ ADD_TEST(${TEST_NAME} python UsersGuideExamplesTest.py)
 SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES
   LABELS "${COMPONENT_NAME}"
   TIMEOUT ${TIMEOUT}
-  ENVIRONMENT "PYTHONPATH=../../bin:$ENV{PYTHONPATH}"
+  ENVIRONMENT "${PYTHONPATH}"
   )

diff --git a/src/RENUMBER_Swig/UsersGuideExamplesTest.py b/src/RENUMBER_Swig/UsersGuideExamplesTest.py
index c4639069f53536c72c0810000b1f9e2ec90b2b72..cc851db0d93c7793ffa73f1d0a83d44467ed916b 100644 (file)
--- a/src/RENUMBER_Swig/UsersGuideExamplesTest.py
+++ b/src/RENUMBER_Swig/UsersGuideExamplesTest.py
@@ -20,10 +20,7 @@
 
 import sys
 
-if sys.platform == "win32":
-    from MEDCouplingCompat import *
-else:
-    from medcoupling import *
+from medcoupling import *
 
 from math import pi, sqrt