updated copyright message

[modules/kernel.git] / src / SALOMEDS / Test / TestSALOMEDS.py

diff --git a/src/SALOMEDS/Test/TestSALOMEDS.py b/src/SALOMEDS/Test/TestSALOMEDS.py
index fbb61ef23e43a42886cb4a8d6e344f35c8a2bf7d..6e498cada86f1ce1c29f7857887cd08e509321c1 100644 (file)
--- a/src/SALOMEDS/Test/TestSALOMEDS.py
+++ b/src/SALOMEDS/Test/TestSALOMEDS.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2014  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2023  CEA, EDF, OPEN CASCADE
 #
 # Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -21,15 +21,17 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-import sys, os,signal,string,commands
-import runSalome
+import sys, os,signal,string,subprocess
+import subprocess
+import runSalomeOld
 import orbmodule
 import TestKiller
+import setenv
 
 # get SALOME environment :
 
-args, modules_list, modules_root_dir = runSalome.get_config()
-runSalome.set_env(args, modules_list, modules_root_dir)
+args, modules_list, modules_root_dir = setenv.get_config()
+setenv.set_env(args, modules_list, modules_root_dir)
 
 # launch CORBA naming server
 
@@ -37,15 +39,17 @@ clt=orbmodule.client()
 
 # launch CORBA logger server
 
-myServer=runSalome.LoggerServer(args)
+myServer=runSalomeOld.LoggerServer(args)
 myServer.run()
 clt.waitLogger("Logger")
 
 # execute Unit Test
 
-command = ['TestSALOMEDS']
-ret = os.spawnvp(os.P_WAIT, command[0], command)
+command = ['./TestSALOMEDS']
+ret = subprocess.call(command)
 
-# kill Test process 
+# kill Test process
 
-TestKiller.killProcess(runSalome.process_id)
+TestKiller.killProcess(runSalomeOld.process_id)
+TestKiller.closeSalome()
+exit(ret)