summaryrefslogtreecommitdiff
path: root/py/test/Ice/operations/Client.py
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2006-06-09 02:47:29 +0000
committerBernard Normier <bernard@zeroc.com>2006-06-09 02:47:29 +0000
commit56e56ecfac2de771fd6b4775adbb2dd12fdc72af (patch)
tree412f33256979309733cccc3f63be58052d14fd88 /py/test/Ice/operations/Client.py
parentMinor fix to initialize() (diff)
downloadice-56e56ecfac2de771fd6b4775adbb2dd12fdc72af.tar.bz2
ice-56e56ecfac2de771fd6b4775adbb2dd12fdc72af.tar.xz
ice-56e56ecfac2de771fd6b4775adbb2dd12fdc72af.zip
Fixes for bug #542 and #1015 (default properties)
Diffstat (limited to 'py/test/Ice/operations/Client.py')
-rw-r--r--py/test/Ice/operations/Client.py15
1 files changed, 8 insertions, 7 deletions
diff --git a/py/test/Ice/operations/Client.py b/py/test/Ice/operations/Client.py
index 29b70ddba84..37b594e22f3 100644
--- a/py/test/Ice/operations/Client.py
+++ b/py/test/Ice/operations/Client.py
@@ -38,8 +38,8 @@ def test(b):
if not b:
raise RuntimeError('test assertion failed')
-def run(args, communicator):
- myClass = AllTests.allTests(communicator)
+def run(args, communicator, initData):
+ myClass = AllTests.allTests(communicator, initData)
print "testing server shutdown...",
myClass.shutdown()
@@ -56,12 +56,13 @@ try:
# In this test, we need at least two threads in the
# client side thread pool for nested AMI.
#
- properties = Ice.getDefaultProperties(sys.argv)
- properties.setProperty('Ice.ThreadPool.Client.Size', '2')
- properties.setProperty('Ice.ThreadPool.Client.SizeWarn', '0')
+ initData = Ice.InitializationData()
+ initData.properties = Ice.createProperties(sys.argv)
+ initData.properties.setProperty('Ice.ThreadPool.Client.Size', '2')
+ initData.properties.setProperty('Ice.ThreadPool.Client.SizeWarn', '0')
- communicator = Ice.initialize(sys.argv)
- status = run(sys.argv, communicator)
+ communicator = Ice.initialize(sys.argv, initData)
+ status = run(sys.argv, communicator, initData)
except:
traceback.print_exc()
status = False