summaryrefslogtreecommitdiff
path: root/python/test
diff options
context:
space:
mode:
authorDwayne Boone <dwayne@zeroc.com>2015-05-05 12:04:18 -0230
committerDwayne Boone <dwayne@zeroc.com>2015-05-05 12:04:18 -0230
commit77beda421aa4cbe82b1bf7b7000ed456c0f16437 (patch)
tree33fab63f3196bbcebedb0dd6299c52ed68a7f7d7 /python/test
parentfixing gradle test dependency (diff)
downloadice-77beda421aa4cbe82b1bf7b7000ed456c0f16437.tar.bz2
ice-77beda421aa4cbe82b1bf7b7000ed456c0f16437.tar.xz
ice-77beda421aa4cbe82b1bf7b7000ed456c0f16437.zip
ICE-6479 info test failures with scripting languages
Diffstat (limited to 'python/test')
-rw-r--r--python/test/Ice/info/AllTests.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/python/test/Ice/info/AllTests.py b/python/test/Ice/info/AllTests.py
index c8c754e804b..5dd6dbb5c69 100644
--- a/python/test/Ice/info/AllTests.py
+++ b/python/test/Ice/info/AllTests.py
@@ -38,7 +38,7 @@ def allTests(communicator):
test((ipEndpoint.type() == Ice.TCPEndpointType and isinstance(ipEndpoint, Ice.TCPEndpointInfo)) or
(ipEndpoint.type() == Ice.SSLEndpointType) or
(ipEndpoint.type() == Ice.WSEndpointType and isinstance(ipEndpoint, Ice.WSEndpointInfo)) or
- (ipEndpoint.type() == Ice.WSSEndpointType and isinstance(ipEndpoint, Ice.WSEndpointInfo)))
+ (ipEndpoint.type() == Ice.WSSEndpointType))
udpEndpoint = endps[1].getInfo()
test(isinstance(udpEndpoint, Ice.UDPEndpointInfo))
@@ -153,7 +153,7 @@ def allTests(communicator):
test(ctx["remotePort"] == str(info.localPort))
test(ctx["localPort"] == str(info.remotePort))
- if(base.ice_getConnection().type() == "ws" or base.ice_getConnection().type() == "wss"):
+ if(base.ice_getConnection().type() == "ws"):
test(isinstance(info, Ice.WSConnectionInfo))
test(info.headers["Upgrade"] == "websocket")