Salome HOME
projects
/
modules
/
kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
updated copyright message
[modules/kernel.git]
/
src
/
LifeCycleCORBA_SWIG
/
Test
/
TestLifeCycleCORBA_SWIG.py
diff --git
a/src/LifeCycleCORBA_SWIG/Test/TestLifeCycleCORBA_SWIG.py
b/src/LifeCycleCORBA_SWIG/Test/TestLifeCycleCORBA_SWIG.py
index 45adaa1e63105d6ffbfc0e533698c71d98749dc4..3b51e8b65cad543a69166451300eba514f297cc7 100644
(file)
--- a/
src/LifeCycleCORBA_SWIG/Test/TestLifeCycleCORBA_SWIG.py
+++ b/
src/LifeCycleCORBA_SWIG/Test/TestLifeCycleCORBA_SWIG.py
@@
-1,5
+1,5
@@
# -*- coding: iso-8859-1 -*-
# -*- coding: iso-8859-1 -*-
-# Copyright (C) 2007-20
15 CEA/DEN, EDF R&D
, OPEN CASCADE
+# Copyright (C) 2007-20
23 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
#
# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-26,9
+26,9
@@
# Module : SALOME
# $Header$
#
# Module : SALOME
# $Header$
#
-import sys, os,signal,string,
command
s
+import sys, os,signal,string,
subproces
s
import subprocess
import subprocess
-import runSalome
+import runSalome
Old
import setenv
import orbmodule
import TestKiller
import setenv
import orbmodule
import TestKiller
@@
-52,26
+52,26
@@
clt=orbmodule.client()
# launch CORBA logger server
# launch CORBA logger server
-myServer=runSalome.LoggerServer(args)
+myServer=runSalome
Old
.LoggerServer(args)
myServer.run()
clt.waitLogger("Logger")
# launch registry server
myServer.run()
clt.waitLogger("Logger")
# launch registry server
-myServer=runSalome.RegistryServer(args)
+myServer=runSalome
Old
.RegistryServer(args)
myServer.run()
clt.waitNS("/Registry")
# launch module catalog server
myServer.run()
clt.waitNS("/Registry")
# launch module catalog server
-cataServer=runSalome.CatalogServer(args)
+cataServer=runSalome
Old
.CatalogServer(args)
cataServer.setpath(modules_list,modules_root_dir)
cataServer.run()
clt.waitNS("/Kernel/ModulCatalog")
# launch container manager server
cataServer.setpath(modules_list,modules_root_dir)
cataServer.run()
clt.waitNS("/Kernel/ModulCatalog")
# launch container manager server
-myCmServer = runSalome.LauncherServer(args)
+myCmServer = runSalome
Old
.LauncherServer(args)
myCmServer.setpath(modules_list,modules_root_dir)
myCmServer.run()
clt.waitNS("/SalomeLauncher")
myCmServer.setpath(modules_list,modules_root_dir)
myCmServer.run()
clt.waitNS("/SalomeLauncher")
@@
-95,6
+95,6
@@
launcher.Shutdown()
addToKillList.killList()
addToKillList.killList()
-TestKiller.killProcess(runSalome.process_id)
+TestKiller.killProcess(runSalome
Old
.process_id)
TestKiller.closeSalome()
exit(ret)
TestKiller.closeSalome()
exit(ret)