switch "salome_init() -> salome_init_without_session()" for tests parallelizing

[modules/homard.git] / src / tests / Test / tutorial_6.py

diff --git a/src/tests/Test/tutorial_6.py b/src/tests/Test/tutorial_6.py
index 849998df2545463f4d530cfcc0bb22c243a3900e..32bcef00ac739c4148c53a0f3016d5edebf27ee3 100755 (executable)
--- a/src/tests/Test/tutorial_6.py
+++ b/src/tests/Test/tutorial_6.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2011-2016  CEA/DEN, EDF R&D
+
+# Copyright (C) 2011-2022  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -17,11 +18,12 @@
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 """
 Python script for HOMARD
 Test tutorial_6 associe au tutorial 6
 """
-__revision__ = "V4.02"
+__revision__ = "V4.07"
 
 #========================================================================
 TEST_NAME = "tutorial_6"
@@ -29,7 +31,6 @@ DEBUG = False
 N_ITER_TEST_FILE = 3
 #========================================================================
 import os
-import tempfile
 import sys
 import HOMARD
 import salome
@@ -40,30 +41,17 @@ PATH_HOMARD = os.getenv('HOMARD_ROOT_DIR')
 REP_PYTHON = os.path.join(PATH_HOMARD, "bin", "salome", "test", "HOMARD")
 REP_PYTHON = os.path.normpath(REP_PYTHON)
 sys.path.append(REP_PYTHON)
-from test_util import remove_dir
+from test_util import get_dir
 from test_util import test_results
-# Repertoire des donnees du test
-REP_DATA = os.path.join(PATH_HOMARD, "share", "salome", "homardsamples")
-REP_DATA = os.path.normpath(REP_DATA)
-# Repertoire des resultats
-if DEBUG :
-  DIRCASE = os.path.join("/tmp", TEST_NAME)
-  if ( os.path.isdir(DIRCASE) ) :
-    remove_dir(DIRCASE)
-  os.mkdir(DIRCASE)
-else :
-  DIRCASE = tempfile.mkdtemp(prefix=TEST_NAME)
-# Repertoire des donnees du tutorial
-DATA_TUTORIAL = os.path.join(PATH_HOMARD, "share", "doc", "salome", "gui", "HOMARD", "fr", "_downloads")
-DATA_TUTORIAL = os.path.normpath(DATA_TUTORIAL)
-sys.path.append(DATA_TUTORIAL)
-from tutorial_util import gzip_gunzip
 # ==================================
-gzip_gunzip(DATA_TUTORIAL, 4, -1)
-gzip_gunzip(DATA_TUTORIAL, 6, -1)
+# Répertoires pour ce test
+REP_DATA, DIRCASE = get_dir(PATH_HOMARD, TEST_NAME, DEBUG)
 # ==================================
-
-salome.salome_init()
+#
+import salome
+salome.salome_init_without_session()
+import HOMARD
+#
 import iparameters
 IPAR = iparameters.IParameters(salome.myStudy.GetCommonParameters("Interface Applicative", 1))
 IPAR.append("AP_MODULES_LIST", "Homard")
@@ -80,7 +68,7 @@ Python script for HOMARD
 #
   while not erreur :
     #
-    HOMARD.SetCurrentStudy(salome.myStudy)
+  #  HOMARD.UpdateStudy()
     #
     # Frontières
     # ==========
@@ -189,13 +177,13 @@ while not ERREUR :
   assert HOMARD is not None, "Impossible to load homard engine"
   HOMARD.SetLanguageShort("fr")
 #
-  FICMED = os.path.join(DATA_TUTORIAL, "tutorial_4.00.med")
-  FICFRMED = os.path.join(DATA_TUTORIAL, TEST_NAME+".fr.med")
+  FICMED = os.path.join(REP_DATA, "tutorial_4.00.med")
+  FICFRMED = os.path.join(REP_DATA, TEST_NAME+".fr.med")
   try:
     ERREUR, MESSAGE = homard_exec("PIQUAGE", FICMED, "COURBES", FICFRMED, DEBUG)
-  except Exception, eee:
+  except RuntimeError as eee:
     ERREUR = 2
-    MESSAGE = eee.message
+    MESSAGE = str(eee.message)
   #
   if ERREUR :
     MESSAGE += "Pb in homard_exec"
@@ -212,12 +200,7 @@ while not ERREUR :
 if ERREUR:
   raise Exception(MESSAGE)
 #
-# ==================================
-gzip_gunzip(DATA_TUTORIAL, 4, 1)
-gzip_gunzip(DATA_TUTORIAL, 6, 1)
-# ==================================
-#
 if salome.sg.hasDesktop():
-  salome.sg.updateObjBrowser(True)
+  salome.sg.updateObjBrowser()
   iparameters.getSession().restoreVisualState(1)