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

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

diff --git a/src/tests/Test/tutorial_2.py b/src/tests/Test/tutorial_2.py
index 7f89207c0d2091f30180175e516f44b1534a2bb3..5bc53ec51089bd06945327557f7bf56915168d43 100755 (executable)
--- a/src/tests/Test/tutorial_2.py
+++ b/src/tests/Test/tutorial_2.py
@@ -1,5 +1,5 @@
 # -*- 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
@@ -21,7 +21,7 @@
 Python script for HOMARD
 Test tutorial_2 associe au tutorial 2
 """
-__revision__ = "V4.04"
+__revision__ = "V4.07"
 
 #========================================================================
 TEST_NAME = "tutorial_2"
@@ -30,8 +30,6 @@ N_ITER_TEST_FILE = 2
 #========================================================================
 import os
 import sys
-import HOMARD
-import salome
 #
 # ==================================
 PATH_HOMARD = os.getenv('HOMARD_ROOT_DIR')
@@ -40,20 +38,16 @@ 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 get_dir
-from test_util import get_dir_tutorial
 from test_util import test_results
 # ==================================
 # Répertoires pour ce test
 REP_DATA, DIRCASE = get_dir(PATH_HOMARD, TEST_NAME, DEBUG)
-DATA_TUTORIAL = get_dir_tutorial(PATH_HOMARD)
-# ==================================
-sys.path.append(DATA_TUTORIAL)
-from tutorial_util import gzip_gunzip
 # ==================================
-gzip_gunzip(DATA_TUTORIAL, 2, -1)
-# ==================================
-
-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")
@@ -70,7 +64,7 @@ Python script for HOMARD
   #
   while not erreur :
     #
-    HOMARD.UpdateStudy()
+  #  HOMARD.UpdateStudy()
     #
     # Creation des zones
     # ==================
@@ -156,7 +150,7 @@ while not ERREUR :
   assert HOMARD is not None, "Impossible to load homard engine"
   HOMARD.SetLanguageShort("fr")
 #
-  FICMED = os.path.join(DATA_TUTORIAL, TEST_NAME+".00.med")
+  FICMED = os.path.join(REP_DATA, TEST_NAME+".00.med")
   try:
     ERREUR, MESSAGE = homard_exec("MZERO", FICMED, DEBUG)
   except RuntimeError as eee:
@@ -178,10 +172,6 @@ while not ERREUR :
 if ERREUR:
   raise Exception(MESSAGE)
 #
-# ==================================
-gzip_gunzip(DATA_TUTORIAL, 2, 1)
-# ==================================
-#
 if salome.sg.hasDesktop():
   salome.sg.updateObjBrowser()
   iparameters.getSession().restoreVisualState(1)