summaryrefslogtreecommitdiff
path: root/python/test/Ice/proxy/AllTests.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/proxy/AllTests.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/proxy/AllTests.py')
-rw-r--r--python/test/Ice/proxy/AllTests.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/python/test/Ice/proxy/AllTests.py b/python/test/Ice/proxy/AllTests.py
index 20a2a7176ae..0b84e30993c 100644
--- a/python/test/Ice/proxy/AllTests.py
+++ b/python/test/Ice/proxy/AllTests.py
@@ -241,7 +241,7 @@ def allTests(helper, communicator, collocated):
#test(b1.ice_getLocatorCacheTimeout() == 60)
#prop.setProperty("Ice.Default.LocatorCacheTimeout", "")
- prop.setProperty(propertyPrefix, "test:default -p 12010")
+ prop.setProperty(propertyPrefix, "test:{0}".format(helper.getTestEndpoint()))
property = propertyPrefix + ".Router"
test(not b1.ice_getRouter())
@@ -810,8 +810,6 @@ def allTests(helper, communicator, collocated):
# Working?
ssl = communicator.getProperties().getProperty("Ice.Default.Protocol") == "ssl"
tcp = communicator.getProperties().getProperty("Ice.Default.Protocol") == "tcp"
- if tcp:
- p1.ice_encodingVersion(Ice.Encoding_1_0).ice_ping()
# Two legal TCP endpoints expressed as opaque endpoints
p1 = communicator.stringToProxy("test -e 1.0:opaque -t 1 -e 1.0 -v CTEyNy4wLjAuMeouAAAQJwAAAA==:opaque -t 1 -e 1.0 -v CTEyNy4wLjAuMusuAAAQJwAAAA==")