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

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

diff --git a/src/tests/Test/tutorial_4.py b/src/tests/Test/tutorial_4.py
index 9b9b7152e85c7eaedc143bae8532fa2b1ac61a82..188de5b3c8730b1f79b6d93fcbb19ee2ffe63d05 100755 (executable)
--- a/src/tests/Test/tutorial_4.py
+++ b/src/tests/Test/tutorial_4.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (C) 2011-2019  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
@@ -23,11 +23,12 @@
 Python script for HOMARD
 Test tutorial_4 associe au tutorial 4
 """
-__revision__ = "V5.04"
+__revision__ = "V5.07"
 
 #========================================================================
 TEST_NAME = "tutorial_4"
 DEBUG = False
+VERBOSE = False
 N_ITER_TEST_FILE = 3
 #========================================================================
 import os
@@ -40,21 +41,14 @@ 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, 4, -1)
 # ==================================
 #
 import salome
-salome.salome_init()
+salome.salome_init_without_session()
 import HOMARD
 #
 import iparameters
@@ -169,10 +163,10 @@ 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")
-  XAO_FILE = os.path.join(DATA_TUTORIAL, TEST_NAME+".xao")
+  FICMED = os.path.join(REP_DATA, "tutorial_4.00.med")
+  XAO_FILE = os.path.join(REP_DATA, TEST_NAME+".xao")
   try:
-    ERREUR, MESSAGE = homard_exec("PIQUAGE", FICMED, XAO_FILE, DEBUG)
+    ERREUR, MESSAGE = homard_exec("PIQUAGE", FICMED, XAO_FILE, VERBOSE)
   except RuntimeError as eee:
     ERREUR = 2
     MESSAGE = str(eee.message)
@@ -192,9 +186,6 @@ while not ERREUR :
 if ERREUR:
   raise Exception(MESSAGE)
 #
-# ==================================
-gzip_gunzip(DATA_TUTORIAL, 4, 1)
-# ==================================
 
 if salome.sg.hasDesktop():
   salome.sg.updateObjBrowser()