summaryrefslogtreecommitdiff
path: root/python/test/Ice/ami/Collocated.py
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2018-08-14 20:02:53 +0200
committerJose <jose@zeroc.com>2018-08-14 20:03:24 +0200
commit7d722e7eb41abd0147458c72285f6fea706c980e (patch)
tree3d7d1884d6fccfd8a44ab9dabb8d833813aee846 /python/test/Ice/ami/Collocated.py
parentFixed icehashpassword deprecation warning with python debug (diff)
downloadice-7d722e7eb41abd0147458c72285f6fea706c980e.tar.bz2
ice-7d722e7eb41abd0147458c72285f6fea706c980e.tar.xz
ice-7d722e7eb41abd0147458c72285f6fea706c980e.zip
Fixes to allow run JavaScript and Python tests with workers
Diffstat (limited to 'python/test/Ice/ami/Collocated.py')
-rwxr-xr-xpython/test/Ice/ami/Collocated.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/python/test/Ice/ami/Collocated.py b/python/test/Ice/ami/Collocated.py
index 0b449be5866..b34af35d6f2 100755
--- a/python/test/Ice/ami/Collocated.py
+++ b/python/test/Ice/ami/Collocated.py
@@ -28,8 +28,8 @@ class Collocated(TestHelper):
with self.initialize(properties=properties) as communicator:
- communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010")
- communicator.getProperties().setProperty("ControllerAdapter.Endpoints", "default -p 12011")
+ communicator.getProperties().setProperty("TestAdapter.Endpoints", self.getTestEndpoint())
+ communicator.getProperties().setProperty("ControllerAdapter.Endpoints", self.getTestEndpoint(num=1))
communicator.getProperties().setProperty("ControllerAdapter.ThreadPool.Size", "1")
adapter = communicator.createObjectAdapter("TestAdapter")