X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2Ftests%2FTest%2Ftest_2.py;h=88beb83389544ca2b7a06c209bd0da779e4761af;hb=refs%2Ftags%2FV9_13_0b1;hp=80c2d02b2ddae1117afc71a23abd455257722ab3;hpb=3055df08880d64e07d1fb3e3b59e03d3c1d0ee28;p=modules%2Fhomard.git diff --git a/src/tests/Test/test_2.py b/src/tests/Test/test_2.py index 80c2d02b..88beb833 100755 --- a/src/tests/Test/test_2.py +++ b/src/tests/Test/test_2.py @@ -1,5 +1,5 @@ # -*- 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 @@ -21,7 +21,7 @@ Python script for HOMARD Test test_2 """ -__revision__ = "V4.03" +__revision__ = "V4.05" #======================================================================== TEST_NAME = "test_2" @@ -46,14 +46,14 @@ from test_util import test_results REP_DATA, DIRCASE = get_dir(PATH_HOMARD, TEST_NAME, DEBUG) # ================================== -salome.salome_init() +salome.salome_init_without_session() import iparameters IPAR = iparameters.IParameters(salome.myStudy.GetCommonParameters("Interface Applicative", 1)) IPAR.append("AP_MODULES_LIST", "Homard") # #======================================================================== #======================================================================== -def homard_exec(theStudy): +def homard_exec(): """ Python script for HOMARD """ @@ -61,7 +61,7 @@ Python script for HOMARD # while not error : # - HOMARD.SetCurrentStudy(theStudy) + # HOMARD.UpdateStudy() # # Creation of the boundaries # ========================== @@ -144,7 +144,7 @@ Python script for HOMARD scriptfile = os.path.normpath(scriptfile) dirname = DIRCASE yacs_test_2 = case_test_2.CreateYACSSchema("YACS_test_2", scriptfile, dirname, mesh_file) - yacs_test_2.SetMaxIter(4) + yacs_test_2.SetMaxIter(N_ITER_TEST_FILE+1) yacs_test_2.SetType(1) filexml = os.path.join(DIRCASE, 'yacs_test_2.xml') error = yacs_test_2.WriteOnFile(filexml) @@ -165,7 +165,7 @@ HOMARD.SetLanguageShort("fr") # Exec of HOMARD-SALOME # try : - ERROR = homard_exec(salome.myStudy) + ERROR = homard_exec() if ERROR : raise Exception('Pb in homard_exec at iteration %d' %ERROR ) except RuntimeError as eee: @@ -178,6 +178,6 @@ DESTROY_DIR = not DEBUG test_results(REP_DATA, TEST_NAME, DIRCASE, N_ITER_TEST_FILE, N_REP_TEST_FILE, DESTROY_DIR) # if salome.sg.hasDesktop(): - salome.sg.updateObjBrowser(True) + salome.sg.updateObjBrowser() iparameters.getSession().restoreVisualState(1)