ICE-7240 - Python Ice/servantLocator cross test

5 files changed, 10 insertions, 7 deletions

diff --git a/cpp/test/Ice/servantLocator/AllTests.cpp b/cpp/test/Ice/servantLocator/AllTests.cpp
index ce1e683bd19..bd8fd743e67 100644
--- a/cpp/test/Ice/servantLocator/AllTests.cpp
+++ b/cpp/test/Ice/servantLocator/AllTests.cpp
@@ -101,7 +101,8 @@ testExceptions(const TestIntfPrx& obj)
     }
     catch(const UnknownLocalException& ex)
     {
-        test(ex.unknown.find("Ice::SocketException") != string::npos);
+        test(ex.unknown.find("Ice::SocketException") != string::npos ||
+             ex.unknown.find("Ice.SocketException") != string::npos);
     }
     catch(...)
     {
diff --git a/java/test/src/main/java/test/Ice/servantLocator/AllTests.java b/java/test/src/main/java/test/Ice/servantLocator/AllTests.java
index 8fd6804a976..37faaa29f8b 100644
--- a/java/test/src/main/java/test/Ice/servantLocator/AllTests.java
+++ b/java/test/src/main/java/test/Ice/servantLocator/AllTests.java
@@ -106,7 +106,8 @@ public class AllTests
         }
         catch(UnknownLocalException ex)
         {
-            test(ex.unknown.indexOf("Ice::SocketException") >= 0);
+            test(ex.unknown.indexOf("Ice::SocketException") >= 0 ||
+                 ex.unknown.indexOf("Ice.SocketException") >= 0);
         }
         catch(Throwable ex)
         {
diff --git a/objective-c/test/Ice/servantLocator/AllTests.m b/objective-c/test/Ice/servantLocator/AllTests.m
index b9c07fe11fc..3c4b7801a4a 100644
--- a/objective-c/test/Ice/servantLocator/AllTests.m
+++ b/objective-c/test/Ice/servantLocator/AllTests.m
@@ -96,7 +96,8 @@ testExceptions(id<TestServantLocatorTestIntfPrx> obj)
     }
     @catch(ICEUnknownLocalException* ex)
     {
-        test([ex.unknown rangeOfString:@"Ice::SocketException"].location != NSNotFound);
+        test([ex.unknown rangeOfString:@"Ice::SocketException"].location != NSNotFound ||
+             [ex.unknown rangeOfString:@"Ice.SocketException"].location != NSNotFound);
     }
     @catch(id)
     {
diff --git a/python/test/Ice/servantLocator/AllTests.py b/python/test/Ice/servantLocator/AllTests.py
index 966b5245334..73b55b42b69 100644
--- a/python/test/Ice/servantLocator/AllTests.py
+++ b/python/test/Ice/servantLocator/AllTests.py
@@ -222,5 +222,5 @@ def allTests(communicator, collocated):
     except:
         test(False)
     print("ok")
-    
+
     return obj
diff --git a/python/test/Ice/servantLocator/TestI.py b/python/test/Ice/servantLocator/TestI.py
index 5e095ce54a4..b486be66982 100644
--- a/python/test/Ice/servantLocator/TestI.py
+++ b/python/test/Ice/servantLocator/TestI.py
@@ -85,12 +85,12 @@ class ServantLocatorI(Ice.ServantLocator):
 
     def __del__(self):
         test(self._deactivated)
-        
+
     def locate(self, current):
         test(not self._deactivated)
 
         test(current.id.category == self._category or self._category == "")
-        
+
         if current.id.name == "unknown":
             return None
 
@@ -117,7 +117,7 @@ class ServantLocatorI(Ice.ServantLocator):
 
         test(current.id.category == self._category  or self._category == "")
         test(current.id.name == "locate" or current.id.name == "finished")
-        
+
         if current.id.name == "finished":
             self.exception(current)