# -*- 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
# Module : SALOME
# $Header$
#
-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")
-# launch notify server
-
-myServer=runSalome.NotifyServer(args,modules_root_dir)
-myServer.run()
-
# launch registry server
-myServer=runSalome.RegistryServer(args)
+myServer=runSalomeOld.RegistryServer(args)
myServer.run()
clt.waitNS("/Registry")
# launch module catalog server
-cataServer=runSalome.CatalogServer(args)
+cataServer=runSalomeOld.CatalogServer(args)
cataServer.setpath(modules_list,modules_root_dir)
cataServer.run()
clt.waitNS("/Kernel/ModulCatalog")
# launch container manager server
-myCmServer = runSalome.LauncherServer(args)
+myCmServer = runSalomeOld.LauncherServer(args)
myCmServer.setpath(modules_list,modules_root_dir)
myCmServer.run()
clt.waitNS("/SalomeLauncher")
# execute Unit Test
command = ['TestLifeCycleCORBA']
-ret = os.spawnvp(os.P_WAIT, command[0], command)
+ret = subprocess.call(command)
import LifeCycleCORBA_SWIGTest
import unittest
addToKillList.killList()
-TestKiller.killProcess(runSalome.process_id)
+TestKiller.killProcess(runSalomeOld.process_id)
+TestKiller.closeSalome()
+exit(ret)