summaryrefslogtreecommitdiff
path: root/python/test/Ice/exceptions/Server.py
diff options
context:
space:
mode:
Diffstat (limited to 'python/test/Ice/exceptions/Server.py')
-rwxr-xr-xpython/test/Ice/exceptions/Server.py17
1 files changed, 5 insertions, 12 deletions
diff --git a/python/test/Ice/exceptions/Server.py b/python/test/Ice/exceptions/Server.py
index 51c2978d2b3..2afc4e427f5 100755
--- a/python/test/Ice/exceptions/Server.py
+++ b/python/test/Ice/exceptions/Server.py
@@ -24,9 +24,9 @@ def run(args, communicator):
adapter2 = communicator.createObjectAdapter("TestAdapter2")
adapter3 = communicator.createObjectAdapter("TestAdapter3")
object = TestI.ThrowerI()
- adapter.add(object, communicator.stringToIdentity("thrower"))
- adapter2.add(object, communicator.stringToIdentity("thrower"))
- adapter3.add(object, communicator.stringToIdentity("thrower"))
+ adapter.add(object, Ice.stringToIdentity("thrower"))
+ adapter2.add(object, Ice.stringToIdentity("thrower"))
+ adapter3.add(object, Ice.stringToIdentity("thrower"))
adapter.activate()
adapter2.activate()
adapter3.activate()
@@ -44,17 +44,10 @@ try:
initData.properties.setProperty("TestAdapter2.MessageSizeMax", "0")
initData.properties.setProperty("TestAdapter3.Endpoints", "default -p 12012")
initData.properties.setProperty("TestAdapter3.MessageSizeMax", "1")
- communicator = Ice.initialize(sys.argv, initData)
- status = run(sys.argv, communicator)
+ with Ice.initialize(sys.argv, initData) as communicator:
+ status = run(sys.argv, communicator)
except:
traceback.print_exc()
status = False
-if communicator:
- try:
- communicator.destroy()
- except:
- traceback.print_exc()
- status = False
-
sys.exit(not status)