summaryrefslogtreecommitdiff
path: root/python/test/Ice/proxy/Client.py
diff options
context:
space:
mode:
Diffstat (limited to 'python/test/Ice/proxy/Client.py')
-rwxr-xr-xpython/test/Ice/proxy/Client.py34
1 files changed, 7 insertions, 27 deletions
diff --git a/python/test/Ice/proxy/Client.py b/python/test/Ice/proxy/Client.py
index 8f7871fd61d..1bde5dc2a0e 100755
--- a/python/test/Ice/proxy/Client.py
+++ b/python/test/Ice/proxy/Client.py
@@ -8,34 +8,14 @@
#
# **********************************************************************
-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 test(b):
- if not b:
- raise RuntimeError('test assertion failed')
-
-def run(args, communicator):
- myClass = AllTests.allTests(communicator, False)
- myClass.shutdown()
-
- return True
-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
+class Client(TestHelper):
-sys.exit(not status)
+ def run(self, args):
+ with self.initialize(args) as communicator:
+ myClass = AllTests.allTests(self, communicator, False)
+ myClass.shutdown()