Python test suite updates

1 files changed, 13 insertions, 24 deletions

diff --git a/python/test/Ice/info/Server.py b/python/test/Ice/info/Server.py
index db88b8aeb88..37f69e4fa9c 100755
--- a/python/test/Ice/info/Server.py
+++ b/python/test/Ice/info/Server.py
@@ -8,32 +8,21 @@
 #
 # **********************************************************************
 
-import os, sys, traceback
-
+from TestHelper import TestHelper
+TestHelper.loadSlice("Test.ice")
 import Ice
-slice_dir = Ice.getSliceDir()
-if not slice_dir:
-    print(sys.argv[0] + ': Slice directory not found.')
-    sys.exit(1)
+import TestI
 
-Ice.loadSlice("'-I" + slice_dir + "' Test.ice")
-import Test, TestI
 
-def run(args, communicator):
-    communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp -p 12010")
-    adapter = communicator.createObjectAdapter("TestAdapter")
-    adapter.add(TestI.MyDerivedClassI(), Ice.stringToIdentity("test"))
-    adapter.activate()
-    communicator.waitForShutdown()
-    return True
+class Server(TestHelper):
 
-try:
-    initData = Ice.InitializationData()
-    initData.properties = Ice.createProperties(sys.argv)
-    with Ice.initialize(sys.argv, initData) as communicator:
-        status = run(sys.argv, communicator)
-except:
-    traceback.print_exc()
-    status = False
+    def run(self, args):
 
-sys.exit(not status)
+        with self.initialize(args=args) as communicator:
+            communicator.getProperties().setProperty(
+                "TestAdapter.Endpoints", "{0}:{1}".format(self.getTestEndpoint(),
+                                                          self.getTestEndpoint(protocol="udp")))
+            adapter = communicator.createObjectAdapter("TestAdapter")
+            adapter.add(TestI.MyDerivedClassI(), Ice.stringToIdentity("test"))
+            adapter.activate()
+            communicator.waitForShutdown()