X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FTestContainer%2FTestComponentPy.py;h=a57c36a54a7eb3a020ab6af54bd921839ceb6357;hb=4d61f5b8863253a259cde301c39b60909a6b18fa;hp=a2547ffa5c38b985100302e315f90b596b4fe971;hpb=4655b0b0eb5345da6a86852021014b0cbae2ad30;p=modules%2Fkernel.git

diff --git a/src/TestContainer/TestComponentPy.py b/src/TestContainer/TestComponentPy.py
index a2547ffa5..a57c36a54 100755
--- a/src/TestContainer/TestComponentPy.py
+++ b/src/TestContainer/TestComponentPy.py
@@ -1,20 +1,39 @@
-#! /usr/bin/env python
-
-#=============================================================================
-# File      : TestComponentPy.py
-# Created   : lun sep  3 17:54:13 CEST 2001
-# Author    : Paul RASCLE, EDF
-# Project   : SALOME
-# Copyright : EDF 2001
-# $Header$
-#=============================================================================
+#! /usr/bin/env python3
+# 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
+#
+# 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, 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
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
 
+#  SALOME TestContainer : test of container creation and its life cycle
+#  File   : TestComponentPy.py
+#  Author : Paul RASCLE, EDF
+#  Module : SALOME
+#  $Header$
+#
 import os
 import sys
 import string
 from omniORB import CORBA
 import CosNaming
 import Engines
+from Utils_Identity import getShortHostName
 
 
 #initialise the ORB
@@ -25,31 +44,28 @@ obj = orb.resolve_initial_references("NameService")
 rootContext = obj._narrow(CosNaming.NamingContext)
 
 if rootContext is None:
-    print "Name Service Reference is invalid"
+    print("Name Service Reference is invalid")
     sys.exit(1)
 
 #resolve the name /Containers.dir/FactoryServerPy.object
-myMachine=string.split(os.getenv( "HOSTNAME" ),'.')
-machineName= myMachine[0]
-containerName = "FactoryServerPy"
+machineName=getShortHostName()
+containerName = "FactoryServer"
 name = [CosNaming.NameComponent("Containers","dir"),
         CosNaming.NameComponent(machineName,"dir"),
         CosNaming.NameComponent(containerName,"object")]
 
 try:
     obj = rootContext.resolve(name)
-except CosNaming.NamingContext.NotFound, ex:
-    print  containerName , " not found in Naming Service"
+except CosNaming.NamingContext.NotFound as ex:
+    print(containerName , " not found in Naming Service")
     sys.exit(1)
 
 container = obj._narrow(Engines.Container)
-print container._get_machineName()
-comp = container.load_impl("SALOME_TestComponentPy","SALOME_TestComponentPy")
-print comp._get_instanceName()
+print(container.getHostName())
+comp = container.load_impl("SalomeTestComponent","SalomeTestComponent")
+print(comp._get_instanceName())
 comp.ping()
 comptest = comp._narrow(Engines.TestComponent)
 if comptest is None:
-    print "probleme cast"
-print comptest.Coucou(1)
-
-
+    print("probleme cast")
+print(comptest.Coucou(1))