[PYTHON 3] 1st draft

[modules/kernel.git] / src / UnitTests / UnitTests.py

diff --git a/src/UnitTests/UnitTests.py b/src/UnitTests/UnitTests.py
index b31557cd497dea648a02b4980972108b85b3db62..20bb6f49a3db547d572157d38661fc921db5362e 100644 (file)
--- a/src/UnitTests/UnitTests.py
+++ b/src/UnitTests/UnitTests.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2012  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
@@ -7,7 +7,7 @@
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
 # License as published by the Free Software Foundation; either
-# version 2.1 of the License.
+# version 2.1 of the License, or (at your option) any later version.
 #
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -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
@@ -49,11 +50,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)
@@ -76,8 +72,8 @@ clt.waitNS("/SalomeLauncher")
 
 # execute Unit Test
 
-command = ['UnitTests']
-ret = os.spawnvp(os.P_WAIT, command[0], command)
+command = ['./UnitTests']
+ret = subprocess.call(command)
 
 # kill containers created by the Container Manager
 
@@ -85,6 +81,8 @@ import Engines
 launcher = clt.waitNS("/SalomeLauncher",Engines.SalomeLauncher)
 launcher.Shutdown()
 
-# kill Test process 
+# kill Test process
 
 TestKiller.killProcess(runSalome.process_id)
+TestKiller.closeSalome()
+exit(ret)