Fix possible problem with enclosed reloading of targets from SALOME modules

[modules/homard.git] / tests / test_11.py

diff --git a/tests/test_11.py b/tests/test_11.py
index eab14b501a44fd650bf38fb1ba9e83b4abf655c7..00f8770d1ba9bd687911a2e44c4a8d2525f9be8d 100755 (executable)
--- a/tests/test_11.py
+++ b/tests/test_11.py
@@ -1,5 +1,5 @@
-# -*- coding: iso-8859-1 -*-
-# Copyright (C) 2011-2014  CEA/DEN, EDF R&D
+# -*- coding: utf-8 -*-
+# Copyright (C) 2011-2015  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
@@ -19,13 +19,13 @@
 #
 """
 Python script for HOMARD
-Copyright EDF-R&D 2010, 2014
 Test test_11 associe au tutorial 1
 """
-__revision__ = "V2.1"
+__revision__ = "V2.3"
 
 #========================================================================
 Test_Name = "test_11"
+debug=False
 n_iter_test_file = 3
 #========================================================================
 import os
@@ -40,10 +40,16 @@ pathHomard = os.getenv('HOMARD_ROOT_DIR')
 Rep_Test = os.path.join(pathHomard, "share", "salome", "resources", "homard")
 Rep_Test = os.path.normpath(Rep_Test)
 sys.path.append(Rep_Test)
+from test_util import remove_dir
 from test_util import test_results
 # Repertoire des resultats
-dircase = tempfile.mktemp()
-os.mkdir(dircase)
+if debug :
+  dircase = os.path.join("/tmp", Test_Name)
+  if ( os.path.isdir(dircase) ) :
+    remove_dir(dircase)
+  os.mkdir(dircase)
+else :
+  dircase = tempfile.mkdtemp()
 # Repertoire des donnees du tutorial
 data_dir = os.path.join(pathHomard, "share", "doc", "salome", "gui", "HOMARD", "fr", "_downloads")
 data_dir = os.path.normpath(data_dir)
@@ -76,7 +82,6 @@ Python script for HOMARD
   # ===
   Case_1 = homard.CreateCase('Case_1', 'MAILL', data_dir+'/tutorial_1.00.med')
   Case_1.SetDirName(dircase)
-  Case_1.SetConfType(1)
   #
   # Iterations
   # ==========
@@ -121,7 +126,8 @@ except Exception, e:
 # Test of the results
 #
 n_rep_test_file = n_iter_test_file
-test_results(Rep_Test, Test_Name, dircase, n_iter_test_file, n_rep_test_file)
+destroy_dir = not debug
+test_results(Rep_Test, Test_Name, dircase, n_iter_test_file, n_rep_test_file, destroy_dir)
 #
 # ==================================
 gzip_gunzip(data_dir, 1, 1)