ICE-6479 info test failures with scripting languages

3 files changed, 12 insertions, 12 deletions

diff --git a/python/modules/IcePy/ConnectionInfo.cpp b/python/modules/IcePy/ConnectionInfo.cpp
index 455d8a8296b..bac83235083 100644
--- a/python/modules/IcePy/ConnectionInfo.cpp
+++ b/python/modules/IcePy/ConnectionInfo.cpp
@@ -532,7 +532,11 @@ PyObject*
 IcePy::createConnectionInfo(const Ice::ConnectionInfoPtr& connectionInfo)
 {
     PyTypeObject* type;
-    if(Ice::TCPConnectionInfoPtr::dynamicCast(connectionInfo))
+    if(Ice::WSConnectionInfoPtr::dynamicCast(connectionInfo))
+    {
+        type = &WSConnectionInfoType;
+    }
+    else if(Ice::TCPConnectionInfoPtr::dynamicCast(connectionInfo))
     {
         type = &TCPConnectionInfoType;
     }
@@ -540,10 +544,6 @@ IcePy::createConnectionInfo(const Ice::ConnectionInfoPtr& connectionInfo)
     {
         type = &UDPConnectionInfoType;
     }
-    else if(Ice::WSConnectionInfoPtr::dynamicCast(connectionInfo))
-    {
-        type = &WSConnectionInfoType;
-    }
     else if(Ice::IPConnectionInfoPtr::dynamicCast(connectionInfo))
     {
         type = &IPConnectionInfoType;
diff --git a/python/modules/IcePy/EndpointInfo.cpp b/python/modules/IcePy/EndpointInfo.cpp
index a712cb81186..1106390b20a 100644
--- a/python/modules/IcePy/EndpointInfo.cpp
+++ b/python/modules/IcePy/EndpointInfo.cpp
@@ -659,7 +659,11 @@ PyObject*
 IcePy::createEndpointInfo(const Ice::EndpointInfoPtr& endpointInfo)
 {
     PyTypeObject* type;
-    if(Ice::TCPEndpointInfoPtr::dynamicCast(endpointInfo))
+    if(Ice::WSEndpointInfoPtr::dynamicCast(endpointInfo))
+    {
+        type = &WSEndpointInfoType;
+    }
+    else if(Ice::TCPEndpointInfoPtr::dynamicCast(endpointInfo))
     {
         type = &TCPEndpointInfoType;
     }
@@ -667,10 +671,6 @@ IcePy::createEndpointInfo(const Ice::EndpointInfoPtr& endpointInfo)
     {
         type = &UDPEndpointInfoType;
     }
-    else if(Ice::WSEndpointInfoPtr::dynamicCast(endpointInfo))
-    {
-        type = &WSEndpointInfoType;
-    }
     else if(Ice::OpaqueEndpointInfoPtr::dynamicCast(endpointInfo))
     {
         type = &OpaqueEndpointInfoType;
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")