# -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2021 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
# 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 setenv
import orbmodule
import TestKiller
# launch CORBA logger server
-myServer=runSalome.LoggerServer(args)
+myServer=runSalomeOld.LoggerServer(args)
myServer.run()
clt.waitLogger("Logger")
command = ['./TestNamingService']
valgrind = ['valgrind','--leak-check=full']
#command=valgrind+command #to check memory leaks
-ret = os.spawnvp(os.P_WAIT, command[0], command)
+ret = subprocess.call(command)
# kill Test process
-TestKiller.killProcess(runSalome.process_id)
-exit(ret)
\ No newline at end of file
+TestKiller.killProcess(runSalomeOld.process_id)
+TestKiller.closeSalome()
+exit(ret)