Merge branch 'master' into V9_dev

[modules/kernel.git] / src / LifeCycleCORBA / Test / TestLifeCycleCORBA.py

diff --git a/src/LifeCycleCORBA/Test/TestLifeCycleCORBA.py b/src/LifeCycleCORBA/Test/TestLifeCycleCORBA.py
index 45ea3ec340e4e3da06d219eb9a2c8899ec45c712..6d52cebcefc6ea40cdfaecfc4def2d00f076c90a 100644 (file)
--- a/src/LifeCycleCORBA/Test/TestLifeCycleCORBA.py
+++ b/src/LifeCycleCORBA/Test/TestLifeCycleCORBA.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2014  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -21,7 +21,8 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-import sys, os,signal,string,commands
+import sys, os,signal,string,subprocess
+import subprocess
 import runSalome
 import setenv
 import orbmodule
@@ -50,11 +51,6 @@ myServer=runSalome.LoggerServer(args)
 myServer.run()
 clt.waitLogger("Logger")
 
-# launch notify server
-
-myServer=runSalome.NotifyServer(args,modules_root_dir)
-myServer.run()
-
 # launch registry server
 
 myServer=runSalome.RegistryServer(args)
@@ -77,13 +73,14 @@ clt.waitNS("/SalomeLauncher")
 
 # execute Unit Test
 
-command = ['TestLifeCycleCORBA']
-ret = os.spawnvp(os.P_WAIT, command[0], command)
+command = ['./TestLifeCycleCORBA']
+ret = subprocess.call(command)
 
 # kill containers created by the Container Manager
 
 import Engines
 launcher = clt.waitNS("/SalomeLauncher",Engines.SalomeLauncher)
+
 launcher.Shutdown()
 
 # kill Test process
@@ -91,3 +88,5 @@ launcher.Shutdown()
 addToKillList.killList()
 
 TestKiller.killProcess(runSalome.process_id)
+TestKiller.closeSalome()
+exit(ret)