Python test suite updates

1 files changed, 10 insertions, 24 deletions

diff --git a/python/test/Ice/exceptions/Client.py b/python/test/Ice/exceptions/Client.py
index f5bd5ee0b17..da3b41dcf0f 100755
--- a/python/test/Ice/exceptions/Client.py
+++ b/python/test/Ice/exceptions/Client.py
@@ -8,31 +8,17 @@
 #
 # **********************************************************************
 
-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')
+from TestHelper import TestHelper
+TestHelper.loadSlice("Test.ice")
 import AllTests
 
-def run(args, communicator):
-    thrower = AllTests.allTests(communicator)
-    thrower.shutdown()
-    return True
 
-try:
-    initData = Ice.InitializationData()
-    initData.properties = Ice.createProperties(sys.argv)
-    initData.properties.setProperty("Ice.MessageSizeMax", "10")
-    initData.properties.setProperty("Ice.Warn.Connections", "0");
-    with Ice.initialize(sys.argv, initData) as communicator:
-        status = run(sys.argv, communicator)
-except:
-    traceback.print_exc()
-    status = False
+class Client(TestHelper):
 
-sys.exit(not status)
+    def run(self, args):
+        properties = self.createTestProperties(args)
+        properties.setProperty("Ice.MessageSizeMax", "10")
+        properties.setProperty("Ice.Warn.Connections", "0")
+        with self.initialize(properties=properties) as communicator:
+            thrower = AllTests.allTests(self, communicator)
+            thrower.shutdown()