summaryrefslogtreecommitdiff
path: root/cpp/test
diff options
context:
space:
mode:
authorJoe George <joe@zeroc.com>2016-07-19 11:08:30 -0400
committerJoe George <joe@zeroc.com>2016-07-19 15:50:28 -0400
commit1b9ad1d49c3381c1dc30839016fb3b20fde98ac8 (patch)
treee89344ddbaabbedf0b22d400b9d2cfc98427e931 /cpp/test
parentICE-7241 - Python Ice/optional cross test failure (diff)
downloadice-1b9ad1d49c3381c1dc30839016fb3b20fde98ac8.tar.bz2
ice-1b9ad1d49c3381c1dc30839016fb3b20fde98ac8.tar.xz
ice-1b9ad1d49c3381c1dc30839016fb3b20fde98ac8.zip
ICE-7240 - Python Ice/servantLocator cross test
Diffstat (limited to 'cpp/test')
-rw-r--r--cpp/test/Ice/servantLocator/AllTests.cpp3
1 files changed, 2 insertions, 1 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(...)
{