summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2016-06-28 16:19:30 +0200
committerBenoit Foucher <benoit@zeroc.com>2016-06-28 16:19:30 +0200
commitb38f5fa6f22a3d730c425b01c5dff276faeb59cc (patch)
tree5db8bd02d66fb2c6bc94552fbf6aa90b70e531fc /cpp
parentFixed ICE-7190: fixed typo in IceGrid/admin run.py script (diff)
downloadice-b38f5fa6f22a3d730c425b01c5dff276faeb59cc.tar.bz2
ice-b38f5fa6f22a3d730c425b01c5dff276faeb59cc.tar.xz
ice-b38f5fa6f22a3d730c425b01c5dff276faeb59cc.zip
Fixed ICE-7203 - IceSSL configuration test failure (C++)
Diffstat (limited to 'cpp')
-rw-r--r--cpp/test/IceSSL/configuration/AllTests.cpp5
-rw-r--r--cpp/test/IceSSL/configuration/Server.cpp2
2 files changed, 3 insertions, 4 deletions
diff --git a/cpp/test/IceSSL/configuration/AllTests.cpp b/cpp/test/IceSSL/configuration/AllTests.cpp
index 65d4d031640..f903f220c4a 100644
--- a/cpp/test/IceSSL/configuration/AllTests.cpp
+++ b/cpp/test/IceSSL/configuration/AllTests.cpp
@@ -2,7 +2,7 @@
//
// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
//
-// This copy of Ice is licensed to you under the terms dribed in the
+// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
@@ -525,8 +525,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
}
}
#endif
- string endpt = getTestEndpoint(communicator, 0);
- string factoryRef = "factory:" + endpt;
+ string factoryRef = "factory:tcp -p 12010";
ObjectPrxPtr base = communicator->stringToProxy(factoryRef);
test(base);
Test::ServerFactoryPrxPtr factory = ICE_CHECKED_CAST(Test::ServerFactoryPrx, base);
diff --git a/cpp/test/IceSSL/configuration/Server.cpp b/cpp/test/IceSSL/configuration/Server.cpp
index 6a1f98614dd..d2006021028 100644
--- a/cpp/test/IceSSL/configuration/Server.cpp
+++ b/cpp/test/IceSSL/configuration/Server.cpp
@@ -18,7 +18,7 @@ using namespace std;
int
run(int, char**, const Ice::CommunicatorPtr& communicator)
{
- communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0));
+ communicator->getProperties()->setProperty("TestAdapter.Endpoints", "tcp -p 12010");
Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
Ice::Identity id = communicator->stringToIdentity("factory");
adapter->add(ICE_MAKE_SHARED(ServerFactoryI), id);