Python test suite updates

1 files changed, 13 insertions, 19 deletions

diff --git a/python/test/Ice/binding/Server.py b/python/test/Ice/binding/Server.py
index a7f24ce1642..c720f9919ac 100755
--- a/python/test/Ice/binding/Server.py
+++ b/python/test/Ice/binding/Server.py
@@ -8,27 +8,21 @@
 #
 # **********************************************************************
 
-import os, sys, traceback
-
 import Ice
-Ice.loadSlice('Test.ice')
-import Test, TestI
+from TestHelper import TestHelper
+TestHelper.loadSlice("Test.ice")
+import TestI
+
+
+class Server(TestHelper):
 
-def run(args, communicator):
-    communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010")
-    adapter = communicator.createObjectAdapter("TestAdapter")
-    id = Ice.stringToIdentity("communicator")
-    adapter.add(TestI.RemoteCommunicatorI(), id)
-    adapter.activate()
+    def run(self, args):
 
-    communicator.waitForShutdown()
-    return True
+        with self.initialize(args) as communicator:
 
-try:
-    with Ice.initialize(sys.argv) as communicator:
-         status = run(sys.argv, communicator)
-except:
-    traceback.print_exc()
-    status = False
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", self.getTestEndpoint())
+            adapter = communicator.createObjectAdapter("TestAdapter")
+            adapter.add(TestI.RemoteCommunicatorI(), Ice.stringToIdentity("communicator"))
+            adapter.activate()
 
-sys.exit(not status)
+            communicator.waitForShutdown()