summaryrefslogtreecommitdiff
path: root/py/test/Ice/operations/Collocated.py
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2014-11-04 12:15:52 +0100
committerBenoit Foucher <benoit@zeroc.com>2014-11-04 12:15:52 +0100
commit2a707c77f3342955869b98565f4abd8051a1f45a (patch)
tree55e1d24b31eac51ea2c4fdc4885f66385c058dc4 /py/test/Ice/operations/Collocated.py
parentICE-5811 - Minor fix for Java demo distribution build (diff)
downloadice-2a707c77f3342955869b98565f4abd8051a1f45a.tar.bz2
ice-2a707c77f3342955869b98565f4abd8051a1f45a.tar.xz
ice-2a707c77f3342955869b98565f4abd8051a1f45a.zip
Fixed ICE-5819: added comments and fixed some tests to work with deactivated OA
Diffstat (limited to 'py/test/Ice/operations/Collocated.py')
-rwxr-xr-xpy/test/Ice/operations/Collocated.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/py/test/Ice/operations/Collocated.py b/py/test/Ice/operations/Collocated.py
index 33aac07e2a3..3a89f62fd7a 100755
--- a/py/test/Ice/operations/Collocated.py
+++ b/py/test/Ice/operations/Collocated.py
@@ -23,7 +23,7 @@ def run(args, communicator):
communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010")
adapter = communicator.createObjectAdapter("TestAdapter")
prx = adapter.add(TestI.MyDerivedClassI(), communicator.stringToIdentity("test"))
- adapter.activate()
+ #adapter.activate() // Don't activate OA to ensure collocation is used.
if prx.ice_getConnection():
raise RuntimeError("collocation doesn't work")