X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2Ftests%2FTest%2Ftutorial_2.py;h=273438c670e3230b6e3999fa89ed77bc272a1188;hb=b8b05864d14bb52293c5c80f46c103b51d65f5cd;hp=fa1c3d98d1ed040992ce6a5ac0363f0aed10ed05;hpb=006b17c64a532b9b00f44ea9ef1605653cbcbf2f;p=modules%2Fhomard.git

diff --git a/src/tests/Test/tutorial_2.py b/src/tests/Test/tutorial_2.py
index fa1c3d98..273438c6 100755
--- 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-2021  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.03"
+__revision__ = "V4.06"
 
 #========================================================================
 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,18 +38,18 @@ 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, DATA_TUTORIAL = get_dir(PATH_HOMARD, TEST_NAME, DEBUG)
-# ==================================
-sys.path.append(DATA_TUTORIAL)
-from tutorial_util import gzip_gunzip
+REP_DATA, DIRCASE = get_dir(PATH_HOMARD, TEST_NAME, DEBUG)
+DATA_TUTORIAL = get_dir_tutorial(PATH_HOMARD)
 # ==================================
-gzip_gunzip(DATA_TUTORIAL, 2, -1)
-# ==================================
-
+#
+import salome
 salome.salome_init()
+import HOMARD
+#
 import iparameters
 IPAR = iparameters.IParameters(salome.myStudy.GetCommonParameters("Interface Applicative", 1))
 IPAR.append("AP_MODULES_LIST", "Homard")
@@ -68,7 +66,7 @@ Python script for HOMARD
   #
   while not erreur :
     #
-    HOMARD.SetCurrentStudy(salome.myStudy)
+  #  HOMARD.UpdateStudy()
     #
     # Creation des zones
     # ==================
@@ -176,11 +174,7 @@ while not ERREUR :
 if ERREUR:
   raise Exception(MESSAGE)
 #
-# ==================================
-gzip_gunzip(DATA_TUTORIAL, 2, 1)
-# ==================================
-#
 if salome.sg.hasDesktop():
-  salome.sg.updateObjBrowser(True)
+  salome.sg.updateObjBrowser()
   iparameters.getSession().restoreVisualState(1)