From 9900ce4eab3461ad8d24e2b337dddd1cce43e64c Mon Sep 17 00:00:00 2001 From: vsr Date: Mon, 8 Nov 2021 19:41:51 +0300 Subject: [PATCH] bos #26609 Patching tests (Windows) --- doc/salome/examples/test_smeshplugins.py | 37 ++++++++++++++---------- doc/salome/examples/tests.set | 7 ++++- 2 files changed, 27 insertions(+), 17 deletions(-) diff --git a/doc/salome/examples/test_smeshplugins.py b/doc/salome/examples/test_smeshplugins.py index 48f12085c..a6efe765c 100644 --- a/doc/salome/examples/test_smeshplugins.py +++ b/doc/salome/examples/test_smeshplugins.py @@ -17,6 +17,7 @@ __revision__ = "V1.0" ComputeMeshes = True import salome +import platform salome.salome_init_without_session() theStudy = salome.myStudy @@ -74,23 +75,27 @@ while not ERROR : print(TEXTE+": OK") # B.2. Gmsh - TEXTE = "Gmsh" - MESH_2 = smesh.Mesh(BOX) - smesh.SetName(MESH_2.GetMesh(), "M_"+TEXTE) - try : - GMSH = MESH_2.Tetrahedron(algo=smeshBuilder.GMSH) - except : - MESSAGE += "\nImpossible d'utiliser "+TEXTE - ERROR += 1 + # GMSH for windows not yet implemented BOS #18709 + if platform.system() != "Windows" : + TEXTE = "Gmsh" + MESH_2 = smesh.Mesh(BOX) + smesh.SetName(MESH_2.GetMesh(), "M_"+TEXTE) + try : + GMSH = MESH_2.Tetrahedron(algo=smeshBuilder.GMSH) + except : + MESSAGE += "\nImpossible d'utiliser "+TEXTE + ERROR += 1 + else : + if ComputeMeshes : + smesh.SetName(GMSH.GetAlgorithm(), TEXTE) + OK_COMPUTE = MESH_2.Compute() + if not OK_COMPUTE : + MESSAGE += "\nErreur avec "+TEXTE + ERROR += 1 + else : + print(TEXTE+": OK") else : - if ComputeMeshes : - smesh.SetName(GMSH.GetAlgorithm(), TEXTE) - OK_COMPUTE = MESH_2.Compute() - if not OK_COMPUTE : - MESSAGE += "\nErreur avec "+TEXTE - ERROR += 1 - else : - print(TEXTE+": OK") + print("Skipping B.2 on windows") # B.3. MG_CADSurf TEXTE = "MG_CADSurf" diff --git a/doc/salome/examples/tests.set b/doc/salome/examples/tests.set index 4e392b19d..f3b8249ac 100644 --- a/doc/salome/examples/tests.set +++ b/doc/salome/examples/tests.set @@ -43,7 +43,6 @@ SET(BAD_TESTS quality_controls_ex22.py viewing_meshes_ex01.py radial_prism_3d_algo.py - test_smeshplugin_mg_tetra_parallele.py test_smeshplugins.py MGAdaptTests_without_session.py blocFissure_01_without_session.py @@ -55,6 +54,12 @@ SET(BAD_TESTS blocFissure_07_without_session.py ) +IF (NOT WIN32) + LIST(APPEND BAD_TESTS + test_smeshplugin_mg_tetra_parallele.py + ) +ENDIF(NOT WIN32) + SET(GOOD_TESTS cartesian_algo.py create_penta_biquad.py -- 2.30.2