distinction test/tutorial

diff --git a/src/tests/Test/test_1.py b/src/tests/Test/test_1.py
index 35a0648d3737160d036567a99b4120971443a4b2..cbc2a598277bcfdb0e602e7f074eccca961c5752 100755 (executable)
--- a/src/tests/Test/test_1.py
+++ b/src/tests/Test/test_1.py
@@ -21,7 +21,7 @@
 Python script for HOMARD
 Test test_1
 """
-__revision__ = "V4.02"
+__revision__ = "V4.03"
 
 #========================================================================
 TEST_NAME = "test_1"
@@ -43,7 +43,7 @@ from test_util import get_dir
 from test_util import test_results
 # ==================================
 # Répertoires pour ce test
-REP_DATA, DIRCASE, DATA_TUTORIAL = get_dir(PATH_HOMARD, TEST_NAME, DEBUG)
+REP_DATA, DIRCASE = get_dir(PATH_HOMARD, TEST_NAME, DEBUG)
 # ==================================
 
 salome.salome_init()

diff --git a/src/tests/Test/test_2.py b/src/tests/Test/test_2.py
index b82a862d2e1b293aedda2f38e969d586391a3de1..80c2d02b2ddae1117afc71a23abd455257722ab3 100755 (executable)
--- a/src/tests/Test/test_2.py
+++ b/src/tests/Test/test_2.py
@@ -21,7 +21,7 @@
 Python script for HOMARD
 Test test_2
 """
-__revision__ = "V4.02"
+__revision__ = "V4.03"
 
 #========================================================================
 TEST_NAME = "test_2"
@@ -43,7 +43,7 @@ from test_util import get_dir
 from test_util import test_results
 # ==================================
 # Répertoires pour ce test
-REP_DATA, DIRCASE, DATA_TUTORIAL = get_dir(PATH_HOMARD, TEST_NAME, DEBUG)
+REP_DATA, DIRCASE = get_dir(PATH_HOMARD, TEST_NAME, DEBUG)
 # ==================================
 
 salome.salome_init()

diff --git a/src/tests/Test/test_3.py b/src/tests/Test/test_3.py
index 21c021bd3bab7940af2efafdd4ea4c18591757c5..92525f35829e411491de0a0f6b87ef806c604138 100755 (executable)
--- a/src/tests/Test/test_3.py
+++ b/src/tests/Test/test_3.py
@@ -21,7 +21,7 @@
 Python script for HOMARD
 Test test_3
 """
-__revision__ = "V4.03"
+__revision__ = "V4.04"
 
 #========================================================================
 TEST_NAME = "test_3"
@@ -44,7 +44,7 @@ from test_util import get_dir
 from test_util import test_results
 # ==================================
 # Répertoires pour ce test
-REP_DATA, DIRCASE, DATA_TUTORIAL = get_dir(PATH_HOMARD, TEST_NAME, DEBUG)
+REP_DATA, DIRCASE = get_dir(PATH_HOMARD, TEST_NAME, DEBUG)
 # ==================================
 
 salome.salome_init()

diff --git a/src/tests/Test/test_4.py b/src/tests/Test/test_4.py
index 485a29a59838f7ca6fd7f736b446a24c3e55f5d1..8d6306bc49a773724b566b57106dd53cef1dbfaa 100755 (executable)
--- a/src/tests/Test/test_4.py
+++ b/src/tests/Test/test_4.py
@@ -21,7 +21,7 @@
 Python script for HOMARD
 Test test_4
 """
-__revision__ = "V3.02"
+__revision__ = "V3.03"
 
 #========================================================================
 TEST_NAME = "test_4"
@@ -51,7 +51,7 @@ from test_util import get_dir
 from test_util import test_results
 # ==================================
 # Répertoires pour ce test
-REP_DATA, DIRCASE, DATA_TUTORIAL = get_dir(PATH_HOMARD, TEST_NAME, DEBUG)
+REP_DATA, DIRCASE = get_dir(PATH_HOMARD, TEST_NAME, DEBUG)
 # ==================================
 
 salome.salome_init()

diff --git a/src/tests/Test/test_5.py b/src/tests/Test/test_5.py
index a7b4b9f8917b20835376f02c67916787e9c55d43..84bde230713468a881c4ced120b9ce451c3555b9 100755 (executable)
--- a/src/tests/Test/test_5.py
+++ b/src/tests/Test/test_5.py
@@ -22,7 +22,7 @@ Python script for HOMARD
 Specific conditions for Code_Saturne
 Test test_5
 """
-__revision__ = "V2.02"
+__revision__ = "V2.03"
 
 #========================================================================
 TEST_NAME = "test_5"
@@ -55,7 +55,7 @@ from test_util import get_dir
 from test_util import test_results
 # ==================================
 # Répertoires pour ce test
-REP_DATA, DIRCASE, DATA_TUTORIAL = get_dir(PATH_HOMARD, TEST_NAME, DEBUG)
+REP_DATA, DIRCASE = get_dir(PATH_HOMARD, TEST_NAME, DEBUG)
 # ==================================
 
 salome.salome_init()

diff --git a/src/tests/Test/test_6.py b/src/tests/Test/test_6.py
index 0182563b83abb78cf9d2b7c4a461788abb9dc6f6..a64379b94391b723e6d1e8c404691c86c6b18508 100755 (executable)
--- a/src/tests/Test/test_6.py
+++ b/src/tests/Test/test_6.py
@@ -21,7 +21,7 @@
 Python script for HOMARD
 Test test_6
 """
-__revision__ = "V1.03"
+__revision__ = "V1.04"
 
 #========================================================================
 TEST_NAME = "test_6"
@@ -47,7 +47,8 @@ from test_util import get_dir
 from test_util import test_results
 # ==================================
 # Répertoires pour ce test
-REP_DATA, DIRCASE, DATA_TUTORIAL = get_dir(PATH_HOMARD, TEST_NAME, DEBUG)
+REP_DATA, DIRCASE = get_dir(PATH_HOMARD, TEST_NAME, DEBUG)
+# ==================================
 
 salome.salome_init()
 import iparameters

diff --git a/src/tests/Test/test_util.py b/src/tests/Test/test_util.py
index c33f98ea03c567c909939e23f905691e7d7b4822..960c0e8dafb814808456df205695df057ce17e32 100755 (executable)
--- a/src/tests/Test/test_util.py
+++ b/src/tests/Test/test_util.py
@@ -21,7 +21,7 @@
 Python script for HOMARD
 Utilitaires pour les tests
 """
-__revision__ = "V4.01"
+__revision__ = "V4.02"
 
 import os
 import tempfile
@@ -47,13 +47,22 @@ Copyright EDF 2018
     os.mkdir(dircase)
   else :
     dircase = tempfile.mkdtemp(prefix=test_name)
+#
+  return rep_data, dircase
+#
+#========================================================================
+#========================================================================
+def get_dir_tutorial(path_homard) :
+  """
+Get directory for the tutorial.
+Copyright EDF 2018
+  """
 #
 # Répertoire des données du tutorial
   data_tutorial = os.path.join(path_homard, "share", "doc", "salome", "gui", "HOMARD", "fr", "_downloads")
   data_tutorial = os.path.normpath(data_tutorial)
 #
-  return rep_data, dircase, data_tutorial
-#
+  return data_tutorial
 #========================================================================
 #========================================================================
 def remove_dir(directory) :

diff --git a/src/tests/Test/tutorial_1.py b/src/tests/Test/tutorial_1.py
index 25fd349998f298bf641cb3a07a527e65e6222450..2cf3337ca8a2576de9080e227c559e1718c1e7be 100755 (executable)
--- a/src/tests/Test/tutorial_1.py
+++ b/src/tests/Test/tutorial_1.py
@@ -21,7 +21,7 @@
 Python script for HOMARD
 Test tutorial_1 associe au tutorial 1
 """
-__revision__ = "V4.03"
+__revision__ = "V4.04"
 
 #========================================================================
 TEST_NAME = "tutorial_1"
@@ -40,10 +40,12 @@ 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)
+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

diff --git a/src/tests/Test/tutorial_2.py b/src/tests/Test/tutorial_2.py
index fa1c3d98d1ed040992ce6a5ac0363f0aed10ed05..29595c1aa6b586bd32f2d56ab702ea862495b099 100755 (executable)
--- a/src/tests/Test/tutorial_2.py
+++ b/src/tests/Test/tutorial_2.py
@@ -21,7 +21,7 @@
 Python script for HOMARD
 Test tutorial_2 associe au tutorial 2
 """
-__revision__ = "V4.03"
+__revision__ = "V4.04"
 
 #========================================================================
 TEST_NAME = "tutorial_2"
@@ -40,10 +40,12 @@ 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)
+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

diff --git a/src/tests/Test/tutorial_3.py b/src/tests/Test/tutorial_3.py
index c207e2777f0a2073416820f8ed654e0e599f1620..7b7dfaa3b12940e14ebacd5a0282f2474d990e42 100755 (executable)
--- a/src/tests/Test/tutorial_3.py
+++ b/src/tests/Test/tutorial_3.py
@@ -21,7 +21,7 @@
 Python script for HOMARD
 Test tutorial_3 associe au tutorial 3
 """
-__revision__ = "V4.03"
+__revision__ = "V4.04"
 
 #========================================================================
 TEST_NAME = "tutorial_3"
@@ -40,10 +40,12 @@ 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)
+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

diff --git a/src/tests/Test/tutorial_4.py b/src/tests/Test/tutorial_4.py
index 2bbdaf9aa86da5f0bc326586ed7970360849cc8f..157c7712a47edc9fe19ed19a275bd3b5103f8665 100755 (executable)
--- a/src/tests/Test/tutorial_4.py
+++ b/src/tests/Test/tutorial_4.py
@@ -21,7 +21,7 @@
 Python script for HOMARD
 Test tutorial_4 associe au tutorial 4
 """
-__revision__ = "V5.02"
+__revision__ = "V5.03"
 
 #========================================================================
 TEST_NAME = "tutorial_4"
@@ -40,10 +40,12 @@ 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)
+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

diff --git a/src/tests/Test/tutorial_5.py b/src/tests/Test/tutorial_5.py
index 1cb675e82d03ebca33c9f3bd15748c5dffa4161a..26f4fde5613469ce841faad24ad386d59af06f65 100755 (executable)
--- a/src/tests/Test/tutorial_5.py
+++ b/src/tests/Test/tutorial_5.py
@@ -21,7 +21,7 @@
 Python script for HOMARD
 Test tutorial_5 associe au tutorial 5
 """
-__revision__ = "V4.03"
+__revision__ = "V4.04"
 
 #========================================================================
 TEST_NAME = "tutorial_5"
@@ -40,10 +40,12 @@ 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)
+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

diff --git a/src/tests/Test/tutorial_6.py b/src/tests/Test/tutorial_6.py
index b62473cd6affb53b8bda93604f9913e0b910d1df..2b97e81bce7d87c23e91879a380a3b8def5d9655 100755 (executable)
--- a/src/tests/Test/tutorial_6.py
+++ b/src/tests/Test/tutorial_6.py
@@ -21,7 +21,7 @@
 Python script for HOMARD
 Test tutorial_6 associe au tutorial 6
 """
-__revision__ = "V4.03"
+__revision__ = "V4.04"
 
 #========================================================================
 TEST_NAME = "tutorial_6"
@@ -40,10 +40,12 @@ 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)
+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