summaryrefslogtreecommitdiff
path: root/python/test/Ice/thread/Client.py
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2018-08-06 11:56:42 +0200
committerJose <jose@zeroc.com>2018-08-06 11:56:42 +0200
commit7972f07a3aa244dcde673b7cb5541e70da9193bb (patch)
tree117faced1bb36ac256c7d362e11ac1c49e8e8c88 /python/test/Ice/thread/Client.py
parentUpdate JavaScript tests to use TestHelper class (diff)
downloadice-7972f07a3aa244dcde673b7cb5541e70da9193bb.tar.bz2
ice-7972f07a3aa244dcde673b7cb5541e70da9193bb.tar.xz
ice-7972f07a3aa244dcde673b7cb5541e70da9193bb.zip
Python test suite updates
Diffstat (limited to 'python/test/Ice/thread/Client.py')
-rw-r--r--python/test/Ice/thread/Client.py29
1 files changed, 6 insertions, 23 deletions
diff --git a/python/test/Ice/thread/Client.py b/python/test/Ice/thread/Client.py
index 76b723c5930..25e142b7337 100644
--- a/python/test/Ice/thread/Client.py
+++ b/python/test/Ice/thread/Client.py
@@ -8,30 +8,13 @@
#
# **********************************************************************
-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):
- AllTests.allTests(communicator)
- return True
-try:
- with Ice.initialize(sys.argv) 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=args) as communicator:
+ AllTests.allTests(self, communicator)