Python test suite updates

1 files changed, 18 insertions, 34 deletions

diff --git a/python/test/Ice/dispatcher/Client.py b/python/test/Ice/dispatcher/Client.py
index 6a366f5d6f0..cad129c0831 100755
--- a/python/test/Ice/dispatcher/Client.py
+++ b/python/test/Ice/dispatcher/Client.py
@@ -8,44 +8,28 @@
 #
 # **********************************************************************
 
-import os, sys, traceback
-
 import Ice
-slice_dir = Ice.getSliceDir()
-if not slice_dir:
-    print(sys.argv[0] + ': Slice directory not found.')
-    sys.exit(1)
-
-Ice.loadSlice("'-I" + slice_dir + "' Test.ice")
-import AllTests, Dispatcher
-
-def test(b):
-    if not b:
-        raise RuntimeError('test assertion failed')
-
-def run(args, communicator):
-    AllTests.allTests(communicator, False)
-    return True
+import Dispatcher
+from TestHelper import TestHelper
+TestHelper.loadSlice("Test.ice")
+import AllTests
 
-try:
-    initData = Ice.InitializationData()
-    initData.properties = Ice.createProperties(sys.argv)
 
-    #
-    # Limit the send buffer size, this test relies on the socket
-    # send() blocking after sending a given amount of data.
-    #
-    initData.properties.setProperty("Ice.TCP.SndSize", "50000");
+class Client(TestHelper):
 
-    d = Dispatcher.Dispatcher()
-    initData.dispatcher = d.dispatch
+    def run(self, args):
+        initData = Ice.InitializationData()
+        initData.properties = self.createTestProperties(args)
 
-    with Ice.initialize(sys.argv, initData) as communicator:
-        status = run(sys.argv, communicator)
-except:
-    traceback.print_exc()
-    status = False
+        #
+        # Limit the send buffer size, this test relies on the socket
+        # send() blocking after sending a given amount of data.
+        #
+        initData.properties.setProperty("Ice.TCP.SndSize", "50000")
+        d = Dispatcher.Dispatcher()
+        initData.dispatcher = d.dispatch
 
-Dispatcher.Dispatcher.terminate()
+        with self.initialize(initData=initData) as communicator:
+            AllTests.allTests(self, communicator)
 
-sys.exit(not status)
+        Dispatcher.Dispatcher.terminate()