X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2Ftests%2FTest%2Ftutorial_4.py;h=98c397b72dc3cdadd7b04c90ce82529371ba64f3;hb=refs%2Ftags%2FV9_13_0b1;hp=61ee052c91f9afd33cd78ec705470d2487fc0724;hpb=268a8e27a2bfa2ada7ae95c7a45e3574293e9b9a;p=modules%2Fhomard.git

diff --git a/src/tests/Test/tutorial_4.py b/src/tests/Test/tutorial_4.py
index 61ee052c..98c397b7 100755
--- a/src/tests/Test/tutorial_4.py
+++ b/src/tests/Test/tutorial_4.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2011-2016  CEA/DEN, EDF R&D
+
+# Copyright (C) 2011-2024  CEA, EDF
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -17,21 +18,21 @@
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 """
 Python script for HOMARD
 Test tutorial_4 associe au tutorial 4
 """
-__revision__ = "V5.03"
+__revision__ = "V5.07"
 
 #========================================================================
 TEST_NAME = "tutorial_4"
 DEBUG = False
+VERBOSE = False
 N_ITER_TEST_FILE = 3
 #========================================================================
 import os
 import sys
-import HOMARD
-import salome
 #
 # ==================================
 PATH_HOMARD = os.getenv('HOMARD_ROOT_DIR')
@@ -40,20 +41,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, 4, -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 +67,7 @@ Python script for HOMARD
 #
   while not erreur :
     #
-    HOMARD.UpdateStudy()
+  #  HOMARD.UpdateStudy()
     #
     # Frontières
     # ==========
@@ -166,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)
@@ -189,10 +186,7 @@ while not ERREUR :
 if ERREUR:
   raise Exception(MESSAGE)
 #
-# ==================================
-gzip_gunzip(DATA_TUTORIAL, 4, 1)
-# ==================================
-#
+
 if salome.sg.hasDesktop():
   salome.sg.updateObjBrowser()
   iparameters.getSession().restoreVisualState(1)