From 2668e40087a412b14b77972fcea03e9decd4f904 Mon Sep 17 00:00:00 2001
From: vsr <vsr@opencascade.com>
Date: Wed, 17 Oct 2018 14:31:43 +0300
Subject: [PATCH] 0023583: [CEA 2267] : YACS_YacsLoaderTest_swig test failed

---
 .../Test/YacsLoaderInSessionTest.sh.in        | 20 +++++++++----------
 src/yacsloader_swig/Test/YacsLoaderTest.sh.in |  4 ++--
 src/yacsloader_swig/Test/runUnitTest.sh       |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/yacsloader_swig/Test/YacsLoaderInSessionTest.sh.in b/src/yacsloader_swig/Test/YacsLoaderInSessionTest.sh.in
index 0d08ec774..23e753db4 100644
--- a/src/yacsloader_swig/Test/YacsLoaderInSessionTest.sh.in
+++ b/src/yacsloader_swig/Test/YacsLoaderInSessionTest.sh.in
@@ -26,7 +26,7 @@
 pidecho=$!
 echo $pidecho > "/tmp/YACSTEST_PidEcho"
 
-python @CMAKE_SOURCE_DIR@/src/yacsloader/Test/waitContainers.py
+python3 @CMAKE_SOURCE_DIR@/src/yacsloader/Test/waitContainers.py
 
 # --- launch unit tests
 
@@ -39,63 +39,63 @@ export PYTHONPATH=@CMAKE_BINARY_DIR@/src/engine_swig:$PYTHONPATH
 export PYTHONPATH=@CMAKE_CURRENT_SOURCE_DIR@:$PYTHONPATH
 export PYTHONPATH=@CMAKE_SOURCE_DIR@/src/yacsloader/Test:$PYTHONPATH
 
-python  @CMAKE_CURRENT_SOURCE_DIR@/testExec.py
+python3  @CMAKE_CURRENT_SOURCE_DIR@/testExec.py
 ret0=$?
 if [ $ret0 -gt 0 ]; then
   echo "exec status testExec : " $ret0
   exit $ret0
 fi
 
-python  @CMAKE_CURRENT_SOURCE_DIR@/testResume.py
+python3  @CMAKE_CURRENT_SOURCE_DIR@/testResume.py
 ret1=$?
 if [ $ret1 -gt 0 ]; then
   echo "exec status testResume : " $ret1
   exit $ret1
 fi
 
-python  @CMAKE_CURRENT_SOURCE_DIR@/testLoader.py
+python3  @CMAKE_CURRENT_SOURCE_DIR@/testLoader.py
 ret2=$?
 if [ $ret2 -gt 0 ]; then
   echo "exec status testLoader : " $ret2
   exit $ret2
 fi
 
-python  @CMAKE_CURRENT_SOURCE_DIR@/testEdit.py
+python3  @CMAKE_CURRENT_SOURCE_DIR@/testEdit.py
 ret3=$?
 if [ $ret3 -gt 0 ]; then
   echo "exec status testEdit : " $ret3
   exit $ret3
 fi
 
-python  @CMAKE_CURRENT_SOURCE_DIR@/testSave.py
+python3  @CMAKE_CURRENT_SOURCE_DIR@/testSave.py
 ret4=$?
 if [ $ret4 -gt 0 ]; then
   echo "exec status testSave : " $ret4
   exit $ret4
 fi
 
-python  @CMAKE_CURRENT_SOURCE_DIR@/testRefcount.py
+python3  @CMAKE_CURRENT_SOURCE_DIR@/testRefcount.py
 ret5=$?
 if [ $ret5 -gt 0 ]; then
   echo "exec status testRefcount : " $ret5
   exit $ret5
 fi
 
-python  @CMAKE_CURRENT_SOURCE_DIR@/testSaveLoadRun.py
+python3  @CMAKE_CURRENT_SOURCE_DIR@/testSaveLoadRun.py
 ret6=$?
 if [ $ret6 -gt 0 ]; then
   echo "exec status testSaveLoadRun : " $ret6
   exit $ret6
 fi
 
-python  @CMAKE_CURRENT_SOURCE_DIR@/testProgress.py
+python3  @CMAKE_CURRENT_SOURCE_DIR@/testProgress.py
 ret7=$?
 if [ $ret7 -gt 0 ]; then
   echo "exec status testProgress : " $ret7
   exit $ret7
 fi
 
-python  @CMAKE_CURRENT_SOURCE_DIR@/testHPDecorator.py
+python3  @CMAKE_CURRENT_SOURCE_DIR@/testHPDecorator.py
 ret8=$?
 if [ $ret8 -gt 0 ]; then
   echo "exec status testHPDecorator : " $ret8
diff --git a/src/yacsloader_swig/Test/YacsLoaderTest.sh.in b/src/yacsloader_swig/Test/YacsLoaderTest.sh.in
index d9399aff0..6d4e30b45 100755
--- a/src/yacsloader_swig/Test/YacsLoaderTest.sh.in
+++ b/src/yacsloader_swig/Test/YacsLoaderTest.sh.in
@@ -46,7 +46,7 @@ EOF
   # --- launch in background a SALOME session (servers)
 
   ln -fs @CMAKE_SOURCE_DIR@/src/yacsloader/samples .
-  ./salome > log1 2>&1 &
+  ./salome start -t > log1 2>&1 &
 
   # --- wait a little to let the background process define
   #     the CORBA naming service port and host
@@ -62,7 +62,7 @@ EOF
   # ---------------------------------------------------------------------------
 
   kill -9 `cat "/tmp/YACSTEST_PidEcho"`
-  ./salome shell python killSalome.py
+  ./salome shell python3 killSalome.py
 
   echo "exec status YacsLoaderInSessionTest.sh "  $ret
 
diff --git a/src/yacsloader_swig/Test/runUnitTest.sh b/src/yacsloader_swig/Test/runUnitTest.sh
index 70f453032..36a92964f 100644
--- a/src/yacsloader_swig/Test/runUnitTest.sh
+++ b/src/yacsloader_swig/Test/runUnitTest.sh
@@ -27,7 +27,7 @@ sleep 3
 
 export TESTCOMPONENT_ROOT_DIR=`pwd`/../runtime
 
-python -m unittest discover
+python3 -m unittest discover
 ret=$?
 echo "exec status salome_test_driver " $ret
 
-- 
2.39.2