diff options
Diffstat (limited to 'cpp/test/Ice/proxy')
| -rw-r--r-- | cpp/test/Ice/proxy/AllTests.cpp | 21 | ||||
| -rw-r--r-- | cpp/test/Ice/proxy/Client.cpp | 3 | ||||
| -rw-r--r-- | cpp/test/Ice/proxy/Collocated.cpp | 3 | ||||
| -rw-r--r-- | cpp/test/Ice/proxy/Server.cpp | 4 | ||||
| -rw-r--r-- | cpp/test/Ice/proxy/ServerAMD.cpp | 3 | ||||
| -rwxr-xr-x | cpp/test/Ice/proxy/run.py | 27 |
6 files changed, 5 insertions, 56 deletions
diff --git a/cpp/test/Ice/proxy/AllTests.cpp b/cpp/test/Ice/proxy/AllTests.cpp index 03f6d87b367..25ce9ac8ffb 100644 --- a/cpp/test/Ice/proxy/AllTests.cpp +++ b/cpp/test/Ice/proxy/AllTests.cpp @@ -1260,10 +1260,6 @@ allTests(const Ice::CommunicatorPtr& communicator) } const bool tcp = communicator->getProperties()->getProperty("Ice.Default.Protocol") == "tcp"; - if(tcp) - { - p1->ice_encodingVersion(Ice::Encoding_1_0)->ice_ping(); - } // Two legal TCP endpoints expressed as opaque endpoints p1 = communicator->stringToProxy("test -e 1.0:opaque -e 1.0 -t 1 -v CTEyNy4wLjAuMeouAAAQJwAAAA==:opaque -e 1.0 -t 1 -v CTEyNy4wLjAuMusuAAAQJwAAAA=="); @@ -1288,23 +1284,6 @@ allTests(const Ice::CommunicatorPtr& communicator) } // - // Try to invoke on the endpoint to verify that we get a - // NoEndpointException (or ConnectionRefusedException when - // running with SSL). - // - if(ssl) - { - try - { - p1->ice_encodingVersion(Ice::Encoding_1_0)->ice_ping(); - test(false); - } - catch(const Ice::ConnectFailedException&) - { - } - } - - // // Test that the proxy with an SSL endpoint and a nonsense // endpoint (which the server doesn't understand either) can be // sent over the wire and returned by the server without losing diff --git a/cpp/test/Ice/proxy/Client.cpp b/cpp/test/Ice/proxy/Client.cpp index dfd2ae3820f..9ba427230dd 100644 --- a/cpp/test/Ice/proxy/Client.cpp +++ b/cpp/test/Ice/proxy/Client.cpp @@ -38,7 +38,8 @@ main(int argc, char* argv[]) try { - Ice::CommunicatorHolder ich = Ice::initialize(argc, argv); + Ice::InitializationData initData = getTestInitData(argc, argv); + Ice::CommunicatorHolder ich = Ice::initialize(argc, argv, initData); RemoteConfig rc("Ice/proxy", argc, argv, ich.communicator()); int status = run(argc, argv, ich.communicator()); rc.finished(status); diff --git a/cpp/test/Ice/proxy/Collocated.cpp b/cpp/test/Ice/proxy/Collocated.cpp index 2c7e91d3106..4979865f18b 100644 --- a/cpp/test/Ice/proxy/Collocated.cpp +++ b/cpp/test/Ice/proxy/Collocated.cpp @@ -38,8 +38,7 @@ main(int argc, char* argv[]) try { - Ice::InitializationData initData; - initData.properties = Ice::createProperties(argc, argv); + Ice::InitializationData initData = getTestInitData(argc, argv); initData.properties->setProperty("Ice.Warn.Dispatch", "0"); Ice::CommunicatorHolder ich = Ice::initialize(argc, argv, initData); diff --git a/cpp/test/Ice/proxy/Server.cpp b/cpp/test/Ice/proxy/Server.cpp index ac9b496ae68..793fb95f7a6 100644 --- a/cpp/test/Ice/proxy/Server.cpp +++ b/cpp/test/Ice/proxy/Server.cpp @@ -36,10 +36,8 @@ main(int argc, char* argv[]) try { - Ice::InitializationData initData; - initData.properties = Ice::createProperties(argc, argv); + Ice::InitializationData initData = getTestInitData(argc, argv); initData.properties->setProperty("Ice.Warn.Dispatch", "0"); - Ice::CommunicatorHolder ich = Ice::initialize(argc, argv, initData); return run(argc, argv, ich.communicator()); } diff --git a/cpp/test/Ice/proxy/ServerAMD.cpp b/cpp/test/Ice/proxy/ServerAMD.cpp index db603a4570a..ee5d4556be9 100644 --- a/cpp/test/Ice/proxy/ServerAMD.cpp +++ b/cpp/test/Ice/proxy/ServerAMD.cpp @@ -36,8 +36,7 @@ main(int argc, char* argv[]) try { - Ice::InitializationData initData; - initData.properties = Ice::createProperties(argc, argv); + Ice::InitializationData initData = getTestInitData(argc, argv); initData.properties->setProperty("Ice.Warn.Connections", "0"); initData.properties->setProperty("Ice.Warn.Dispatch", "0"); diff --git a/cpp/test/Ice/proxy/run.py b/cpp/test/Ice/proxy/run.py deleted file mode 100755 index 38e60970744..00000000000 --- a/cpp/test/Ice/proxy/run.py +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/env python -# ********************************************************************** -# -# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. -# -# This copy of Ice is licensed to you under the terms described in the -# ICE_LICENSE file included in this distribution. -# -# ********************************************************************** - -import os, sys - -path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../.." ] -head = os.path.dirname(sys.argv[0]) -if len(head) > 0: - path = [os.path.join(head, p) for p in path] -path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ] -if len(path) == 0: - raise RuntimeError("can't find toplevel directory!") -sys.path.append(os.path.join(path[0], "scripts")) -import TestUtil - -TestUtil.queueClientServerTest() -TestUtil.queueClientServerTest(configName = "amd", localOnly = True, message = "Running test with AMD server.", - server = TestUtil.getTestExecutable("serveramd")) -TestUtil.queueCollocatedTest(additionalOptions = "--Ice.ToStringMode=Compat") -TestUtil.runQueuedTests() |