diff options
418 files changed, 792 insertions, 385 deletions
diff --git a/cpp/test/Freeze/complex/run.py b/cpp/test/Freeze/complex/run.py index 04f9d5edd85..5f17077333d 100755 --- a/cpp/test/Freeze/complex/run.py +++ b/cpp/test/Freeze/complex/run.py @@ -41,3 +41,5 @@ clientProc = TestUtil.startClient(client, " --dbdir %s validate" % os.getcwd(), print "ok" clientProc.startReader() clientProc.waitTestSuccess() + +TestUtil.cleanup() diff --git a/cpp/test/Freeze/dbmap/run.py b/cpp/test/Freeze/dbmap/run.py index 777e6a55b0a..9a8947fa80b 100755 --- a/cpp/test/Freeze/dbmap/run.py +++ b/cpp/test/Freeze/dbmap/run.py @@ -27,3 +27,5 @@ client = os.path.join(os.getcwd(), "client") clientProc = TestUtil.startClient(client, " --Freeze.Warn.Rollback=0 %s" % os.getcwd()) clientProc.waitTestSuccess() + +TestUtil.cleanup() diff --git a/cpp/test/Freeze/evictor/Client.cpp b/cpp/test/Freeze/evictor/Client.cpp index f69b837e1c8..3ba601b0b5e 100644 --- a/cpp/test/Freeze/evictor/Client.cpp +++ b/cpp/test/Freeze/evictor/Client.cpp @@ -464,7 +464,7 @@ private: int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator, bool transactional, bool shutdown) { - string ref = "factory:default -p 12010 -t 30000"; + string ref = "factory:default -p 12010"; Ice::ObjectPrx base = communicator->stringToProxy(ref); test(base); Test::RemoteEvictorFactoryPrx factory = Test::RemoteEvictorFactoryPrx::checkedCast(base); diff --git a/cpp/test/Freeze/evictor/Server.cpp b/cpp/test/Freeze/evictor/Server.cpp index 94c2e91a09e..0817429da82 100644 --- a/cpp/test/Freeze/evictor/Server.cpp +++ b/cpp/test/Freeze/evictor/Server.cpp @@ -68,7 +68,7 @@ public: int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator, const string& envName) { - communicator->getProperties()->setProperty("Factory.Endpoints", "default -p 12010 -t 30000"); + communicator->getProperties()->setProperty("Factory.Endpoints", "default -p 12010"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("Factory"); communicator->addObjectFactory(new ServantFactory, "::Test::Servant"); diff --git a/cpp/test/Freeze/evictor/run.py b/cpp/test/Freeze/evictor/run.py index 00a127220d0..373caccacaf 100755 --- a/cpp/test/Freeze/evictor/run.py +++ b/cpp/test/Freeze/evictor/run.py @@ -26,3 +26,5 @@ TestUtil.cleanDbDir(dbdir) testOptions = " --Freeze.DbEnv.db.DbHome=%s --Ice.Config=%s" % (dbdir, os.path.join(os.getcwd(), "config")) TestUtil.clientServerTest(additionalServerOptions= testOptions, additionalClientOptions= testOptions) + +TestUtil.cleanup() diff --git a/cpp/test/Freeze/oldevictor/Client.cpp b/cpp/test/Freeze/oldevictor/Client.cpp index 0bd8f6668d6..96a1ba3446e 100644 --- a/cpp/test/Freeze/oldevictor/Client.cpp +++ b/cpp/test/Freeze/oldevictor/Client.cpp @@ -366,7 +366,7 @@ private: int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { - string ref = "factory:default -p 12010 -t 30000"; + string ref = "factory:default -p 12010"; Ice::ObjectPrx base = communicator->stringToProxy(ref); test(base); Test::RemoteEvictorFactoryPrx factory = Test::RemoteEvictorFactoryPrx::checkedCast(base); diff --git a/cpp/test/Freeze/oldevictor/Server.cpp b/cpp/test/Freeze/oldevictor/Server.cpp index e5b874853ae..222e1fc1d9f 100644 --- a/cpp/test/Freeze/oldevictor/Server.cpp +++ b/cpp/test/Freeze/oldevictor/Server.cpp @@ -50,7 +50,7 @@ public: int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator, const string& envName) { - communicator->getProperties()->setProperty("Factory.Endpoints", "default -p 12010 -t 30000"); + communicator->getProperties()->setProperty("Factory.Endpoints", "default -p 12010"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("Factory"); Test::RemoteEvictorFactoryPtr factory = new Test::RemoteEvictorFactoryI(adapter, envName); diff --git a/cpp/test/Freeze/oldevictor/run.py b/cpp/test/Freeze/oldevictor/run.py index b7895100038..e5e01aca4e4 100755 --- a/cpp/test/Freeze/oldevictor/run.py +++ b/cpp/test/Freeze/oldevictor/run.py @@ -26,3 +26,5 @@ TestUtil.cleanDbDir(dbdir) testOptions = " --Freeze.DbEnv.db.DbHome=%s --Ice.Config=%s" % (dbdir, os.path.join(os.getcwd(), "config")) TestUtil.clientServerTest(additionalServerOptions = testOptions, additionalClientOptions = testOptions) + +TestUtil.cleanup() diff --git a/cpp/test/FreezeScript/dbmap/run.py b/cpp/test/FreezeScript/dbmap/run.py index 2f74967395e..e1e69086096 100755 --- a/cpp/test/FreezeScript/dbmap/run.py +++ b/cpp/test/FreezeScript/dbmap/run.py @@ -137,3 +137,5 @@ if os.system(command) != 0: sys.exit(1) print "ok" + +TestUtil.cleanup() diff --git a/cpp/test/FreezeScript/evictor/run.py b/cpp/test/FreezeScript/evictor/run.py index dc1f16fd944..d37f8c62a69 100755 --- a/cpp/test/FreezeScript/evictor/run.py +++ b/cpp/test/FreezeScript/evictor/run.py @@ -65,3 +65,5 @@ command = transformdb + " -e --old " + testnew + " --new " + testnew + " -f " + proc = TestUtil.spawn(command) proc.waitTestSuccess() print "ok" + +TestUtil.cleanup() diff --git a/cpp/test/Glacier2/attack/Client.cpp b/cpp/test/Glacier2/attack/Client.cpp index e007bc697be..274718f88ea 100644 --- a/cpp/test/Glacier2/attack/Client.cpp +++ b/cpp/test/Glacier2/attack/Client.cpp @@ -45,7 +45,7 @@ int AttackClient::run(int argc, char* argv[]) { cout << "getting router... " << flush; - ObjectPrx routerBase = communicator()->stringToProxy("Glacier2/router:default -p 12347 -t 10000"); + ObjectPrx routerBase = communicator()->stringToProxy("Glacier2/router:default -p 12347"); Glacier2::RouterPrx router = Glacier2::RouterPrx::checkedCast(routerBase); test(router); communicator()->setDefaultRouter(router); @@ -56,7 +56,7 @@ AttackClient::run(int argc, char* argv[]) cout << "ok" << endl; cout << "making thousands of invocations on proxies... " << flush; - ObjectPrx backendBase = communicator()->stringToProxy("dummy:tcp -p 12010 -t 10000"); + ObjectPrx backendBase = communicator()->stringToProxy("dummy:tcp -p 12010"); BackendPrx backend = BackendPrx::uncheckedCast(backendBase); backend->ice_ping(); @@ -114,7 +114,7 @@ AttackClient::run(int argc, char* argv[]) cout << "testing server and router shutdown... " << flush; backend->shutdown(); communicator()->setDefaultRouter(0); - ObjectPrx adminBase = communicator()->stringToProxy("Glacier2/admin -f Process:tcp -h 127.0.0.1 -p 12348 -t 10000"); + ObjectPrx adminBase = communicator()->stringToProxy("Glacier2/admin -f Process:tcp -h 127.0.0.1 -p 12348"); Ice::ProcessPrx process = Ice::ProcessPrx::checkedCast(adminBase); test(process); process->shutdown(); diff --git a/cpp/test/Glacier2/attack/Server.cpp b/cpp/test/Glacier2/attack/Server.cpp index 851aeab57f2..fad21d5f6c7 100644 --- a/cpp/test/Glacier2/attack/Server.cpp +++ b/cpp/test/Glacier2/attack/Server.cpp @@ -58,7 +58,7 @@ main(int argc, char* argv[]) int BackendServer::run(int argc, char* argv[]) { - communicator()->getProperties()->setProperty("BackendAdapter.Endpoints", "tcp -p 12010 -t 10000"); + communicator()->getProperties()->setProperty("BackendAdapter.Endpoints", "tcp -p 12010"); ObjectAdapterPtr adapter = communicator()->createObjectAdapter("BackendAdapter"); adapter->addServantLocator(new ServantLocatorI, ""); adapter->activate(); diff --git a/cpp/test/Glacier2/attack/run.py b/cpp/test/Glacier2/attack/run.py index 8ad632913ec..7a162745e01 100755 --- a/cpp/test/Glacier2/attack/run.py +++ b/cpp/test/Glacier2/attack/run.py @@ -24,8 +24,8 @@ testdir = os.getcwd() router = os.path.join(TestUtil.getCppBinDir(), "glacier2router") args = ' --Glacier2.RoutingTable.MaxSize=10' + \ - ' --Glacier2.Client.Endpoints="default -p 12347 -t 10000"' + \ - ' --Ice.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348 -t 10000"' + \ + ' --Glacier2.Client.Endpoints="default -p 12347"' + \ + ' --Ice.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348"' + \ ' --Ice.Admin.InstanceName=Glacier2' + \ ' --Glacier2.CryptPasswords="' + os.path.join(testdir, "passwords") + '"' @@ -36,3 +36,5 @@ print "ok" TestUtil.clientServerTest() starterProc.waitTestSuccess() + +TestUtil.cleanup() diff --git a/cpp/test/Glacier2/dynamicFiltering/Client.cpp b/cpp/test/Glacier2/dynamicFiltering/Client.cpp index 9c6047bac79..d80edc19313 100644 --- a/cpp/test/Glacier2/dynamicFiltering/Client.cpp +++ b/cpp/test/Glacier2/dynamicFiltering/Client.cpp @@ -169,7 +169,7 @@ SessionControlClient::run(int argc, char* argv[]) // Shut down the router. // communicator()->setDefaultRouter(0); - ObjectPrx processBase = communicator()->stringToProxy("Glacier2/admin -f Process:tcp -p 12348 -t 10000"); + ObjectPrx processBase = communicator()->stringToProxy("Glacier2/admin -f Process:tcp -p 12348"); Ice::ProcessPrx process = Ice::ProcessPrx::checkedCast(processBase); test(process); process->shutdown(); diff --git a/cpp/test/Glacier2/dynamicFiltering/run.py b/cpp/test/Glacier2/dynamicFiltering/run.py index 618a4ede438..26b152716da 100755 --- a/cpp/test/Glacier2/dynamicFiltering/run.py +++ b/cpp/test/Glacier2/dynamicFiltering/run.py @@ -28,13 +28,13 @@ print "ok" router = os.path.join(TestUtil.getCppBinDir(), "glacier2router") -args = r' --Glacier2.Client.Endpoints="default -p 12347 -t 10000"' + \ - r' --Ice.Admin.Endpoints="tcp -p 12348 -t 10000"' + \ +args = r' --Glacier2.Client.Endpoints="default -p 12347"' + \ + r' --Ice.Admin.Endpoints="tcp -p 12348"' + \ r' --Ice.Admin.InstanceName=Glacier2' + \ - r' --Glacier2.Server.Endpoints="default -p 12349 -t 10000"' + \ - r' --Glacier2.SessionManager="SessionManager:tcp -p 12010 -t 10000"' + \ + r' --Glacier2.Server.Endpoints="default -p 12349"' + \ + r' --Glacier2.SessionManager="SessionManager:tcp -p 12010"' + \ r' --Glacier2.PermissionsVerifier="Glacier2/NullPermissionsVerifier"' + \ - r' --Ice.Default.Locator="locator:default -p 12012 -t 10000"' + r' --Ice.Default.Locator="locator:default -p 12012"' print "starting router...", starterProc = TestUtil.startServer(router, args, count=2) @@ -50,3 +50,5 @@ proc.waitTestSuccess() serverProc.waitTestSuccess() starterProc.waitTestSuccess() + +TestUtil.cleanup() diff --git a/cpp/test/Glacier2/router/Client.cpp b/cpp/test/Glacier2/router/Client.cpp index ee02193888d..8e04ca58ee3 100644 --- a/cpp/test/Glacier2/router/Client.cpp +++ b/cpp/test/Glacier2/router/Client.cpp @@ -86,7 +86,7 @@ public: void run() { CommunicatorPtr communicator = initialize(initData); - ObjectPrx routerBase = communicator->stringToProxy("Glacier2/router:default -p 12347 -t 10000"); + ObjectPrx routerBase = communicator->stringToProxy("Glacier2/router:default -p 12347"); Glacier2::RouterPrx router = Glacier2::RouterPrx::checkedCast(routerBase); communicator->setDefaultRouter(router); @@ -109,7 +109,7 @@ public: ident.category = category; CallbackReceiverPrx receiver = CallbackReceiverPrx::uncheckedCast(adapter->add(_callbackReceiver, ident)); - ObjectPrx base = communicator->stringToProxy("c1/callback:tcp -p 12010 -t 10000"); + ObjectPrx base = communicator->stringToProxy("c1/callback:tcp -p 12010"); base = base->ice_oneway(); CallbackPrx callback = CallbackPrx::uncheckedCast(base); @@ -193,7 +193,7 @@ public: void run() { CommunicatorPtr communicator = initialize(initData); - ObjectPrx routerBase = communicator->stringToProxy("Glacier2/router:default -p 12347 -t 30000"); + ObjectPrx routerBase = communicator->stringToProxy("Glacier2/router:default -p 12347"); _router = Glacier2::RouterPrx::checkedCast(routerBase); communicator->setDefaultRouter(_router); @@ -211,7 +211,7 @@ public: ident.category = category; CallbackReceiverPrx receiver = CallbackReceiverPrx::uncheckedCast(adapter->add(_callbackReceiver, ident)); - ObjectPrx base = communicator->stringToProxy("c1/callback:tcp -p 12010 -t 10000"); + ObjectPrx base = communicator->stringToProxy("c1/callback:tcp -p 12010"); base = base->ice_oneway(); CallbackPrx callback = CallbackPrx::uncheckedCast(base); @@ -438,7 +438,7 @@ CallbackClient::run(int argc, char* argv[]) { cout << "testing stringToProxy for router... " << flush; - routerBase = communicator()->stringToProxy("Glacier2/router:default -p 12347 -t 10000"); + routerBase = communicator()->stringToProxy("Glacier2/router:default -p 12347"); cout << "ok" << endl; } @@ -468,7 +468,7 @@ CallbackClient::run(int argc, char* argv[]) { cout << "testing stringToProxy for server object... " << flush; - base = communicator()->stringToProxy("c1/callback:tcp -p 12010 -t 10000"); + base = communicator()->stringToProxy("c1/callback:tcp -p 12010"); cout << "ok" << endl; } @@ -874,7 +874,7 @@ CallbackClient::run(int argc, char* argv[]) { cout << "testing stringToProxy for admin process facet... " << flush; - processBase = communicator()->stringToProxy("Glacier2/admin -f Process:tcp -h 127.0.0.1 -p 12348 -t 10000"); + processBase = communicator()->stringToProxy("Glacier2/admin -f Process:tcp -h 127.0.0.1 -p 12348"); cout << "ok" << endl; } diff --git a/cpp/test/Glacier2/router/Server.cpp b/cpp/test/Glacier2/router/Server.cpp index 549283cad68..91caef56f0f 100644 --- a/cpp/test/Glacier2/router/Server.cpp +++ b/cpp/test/Glacier2/router/Server.cpp @@ -37,7 +37,7 @@ main(int argc, char* argv[]) int CallbackServer::run(int argc, char* argv[]) { - communicator()->getProperties()->setProperty("CallbackAdapter.Endpoints", "tcp -p 12010 -t 10000"); + communicator()->getProperties()->setProperty("CallbackAdapter.Endpoints", "tcp -p 12010"); ObjectAdapterPtr adapter = communicator()->createObjectAdapter("CallbackAdapter"); adapter->add(new CallbackI(), communicator()->stringToIdentity("c1/callback")); // The test allows "c1" as category. adapter->add(new CallbackI(), communicator()->stringToIdentity("c2/callback")); // The test allows "c2" as category. diff --git a/cpp/test/Glacier2/router/run.py b/cpp/test/Glacier2/router/run.py index 9fb9a8e2240..8ac83d7b822 100755 --- a/cpp/test/Glacier2/router/run.py +++ b/cpp/test/Glacier2/router/run.py @@ -29,9 +29,9 @@ def startRouter(buffered): ' --Glacier2.Filter.Category.Accept="c1 c2"' + \ ' --Glacier2.Filter.Category.AcceptUser="2"' + \ ' --Glacier2.SessionTimeout="30"' + \ - ' --Glacier2.Client.Endpoints="default -p 12347 -t 10000"' + \ - ' --Glacier2.Server.Endpoints="tcp -h 127.0.0.1 -t 10000"' \ - ' --Ice.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348 -t 10000"' + \ + ' --Glacier2.Client.Endpoints="default -p 12347"' + \ + ' --Glacier2.Server.Endpoints="tcp -h 127.0.0.1"' \ + ' --Ice.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348"' + \ ' --Ice.Admin.InstanceName="Glacier2"' + \ ' --Glacier2.CryptPasswords="%s"' % os.path.join(os.getcwd(), "passwords") @@ -70,3 +70,5 @@ TestUtil.clientServerTest() TestUtil.clientServerTest(name, additionalClientOptions = " --shutdown") starterProc.waitTestSuccess() + +TestUtil.cleanup() diff --git a/cpp/test/Glacier2/sessionControl/Client.cpp b/cpp/test/Glacier2/sessionControl/Client.cpp index 7d78af40274..23210091976 100644 --- a/cpp/test/Glacier2/sessionControl/Client.cpp +++ b/cpp/test/Glacier2/sessionControl/Client.cpp @@ -45,7 +45,7 @@ int SessionControlClient::run(int argc, char* argv[]) { cout << "getting router... " << flush; - ObjectPrx routerBase = communicator()->stringToProxy("Glacier2/router:default -p 12347 -t 10000"); + ObjectPrx routerBase = communicator()->stringToProxy("Glacier2/router:default -p 12347"); Glacier2::RouterPrx router = Glacier2::RouterPrx::checkedCast(routerBase); test(router); communicator()->setDefaultRouter(router); @@ -105,7 +105,7 @@ SessionControlClient::run(int argc, char* argv[]) session = Test::SessionPrx::uncheckedCast(router->createSession("userid", "abc123")); session->shutdown(); communicator()->setDefaultRouter(0); - ObjectPrx processBase = communicator()->stringToProxy("Glacier2/admin -f Process:tcp -p 12348 -t 10000"); + ObjectPrx processBase = communicator()->stringToProxy("Glacier2/admin -f Process:tcp -p 12348"); Ice::ProcessPrx process = Ice::ProcessPrx::checkedCast(processBase); test(process); process->shutdown(); diff --git a/cpp/test/Glacier2/sessionControl/Server.cpp b/cpp/test/Glacier2/sessionControl/Server.cpp index 477fe5b8f83..150a2569dc1 100644 --- a/cpp/test/Glacier2/sessionControl/Server.cpp +++ b/cpp/test/Glacier2/sessionControl/Server.cpp @@ -32,7 +32,7 @@ main(int argc, char* argv[]) int SessionControlServer::run(int argc, char* argv[]) { - communicator()->getProperties()->setProperty("SessionControlAdapter.Endpoints", "tcp -p 12010 -t 10000"); + communicator()->getProperties()->setProperty("SessionControlAdapter.Endpoints", "tcp -p 12010"); ObjectAdapterPtr adapter = communicator()->createObjectAdapter("SessionControlAdapter"); adapter->add(new SessionManagerI, communicator()->stringToIdentity("SessionManager")); adapter->activate(); diff --git a/cpp/test/Glacier2/sessionControl/run.py b/cpp/test/Glacier2/sessionControl/run.py index 71797a19354..d6e1ae94615 100755 --- a/cpp/test/Glacier2/sessionControl/run.py +++ b/cpp/test/Glacier2/sessionControl/run.py @@ -28,11 +28,11 @@ print "ok" router = os.path.join(TestUtil.getCppBinDir(), "glacier2router") -args = ' --Glacier2.Client.Endpoints="default -p 12347 -t 10000"' + \ - ' --Ice.Admin.Endpoints="tcp -p 12348 -t 10000"' + \ +args = ' --Glacier2.Client.Endpoints="default -p 12347"' + \ + ' --Ice.Admin.Endpoints="tcp -p 12348"' + \ ' --Ice.Admin.InstanceName=Glacier2' + \ - ' --Glacier2.Server.Endpoints="default -p 12349 -t 10000"' + \ - ' --Glacier2.SessionManager="SessionManager:tcp -p 12010 -t 10000"' \ + ' --Glacier2.Server.Endpoints="default -p 12349"' + \ + ' --Glacier2.SessionManager="SessionManager:tcp -p 12010"' \ ' --Glacier2.PermissionsVerifier="Glacier2/NullPermissionsVerifier"' print "starting router...", @@ -54,3 +54,5 @@ clientProc.startReader() clientProc.waitTestSuccess() serverProc.waitTestSuccess() starterProc.waitTestSuccess() + +TestUtil.cleanup() diff --git a/cpp/test/Glacier2/ssl/Client.cpp b/cpp/test/Glacier2/ssl/Client.cpp index b19af8b7c46..d258ff8eb55 100644 --- a/cpp/test/Glacier2/ssl/Client.cpp +++ b/cpp/test/Glacier2/ssl/Client.cpp @@ -42,7 +42,7 @@ int CallbackClient::run(int argc, char* argv[]) { Glacier2::RouterPrx router = Glacier2::RouterPrx::uncheckedCast( - communicator()->stringToProxy("Glacier2/router:tcp -h 127.0.0.1 -p 12347 -t 10000")); + communicator()->stringToProxy("Glacier2/router:tcp -h 127.0.0.1 -p 12347")); communicator()->setDefaultRouter(router); // @@ -81,7 +81,7 @@ CallbackClient::run(int argc, char* argv[]) // communicator()->setDefaultRouter(Glacier2::RouterPrx()); router = Glacier2::RouterPrx::uncheckedCast( - communicator()->stringToProxy("Glacier2/router:ssl -h 127.0.0.1 -p 12348 -t 10000")); + communicator()->stringToProxy("Glacier2/router:ssl -h 127.0.0.1 -p 12348")); communicator()->setDefaultRouter(router); // @@ -121,7 +121,7 @@ CallbackClient::run(int argc, char* argv[]) communicator()->setDefaultRouter(0); Ice::ProcessPrx process = Ice::ProcessPrx::checkedCast( - communicator()->stringToProxy("Glacier2/admin -f Process:tcp -h 127.0.0.1 -p 12349 -t 10000")); + communicator()->stringToProxy("Glacier2/admin -f Process:tcp -h 127.0.0.1 -p 12349")); process->shutdown(); return EXIT_SUCCESS; diff --git a/cpp/test/Glacier2/ssl/Server.cpp b/cpp/test/Glacier2/ssl/Server.cpp index f053535ffec..431eff941ca 100644 --- a/cpp/test/Glacier2/ssl/Server.cpp +++ b/cpp/test/Glacier2/ssl/Server.cpp @@ -125,7 +125,7 @@ int SessionServer::run(int argc, char* argv[]) { Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapterWithEndpoints( - "SessionServer", "tcp -h 127.0.0.1 -p 12350 -t 10000"); + "SessionServer", "tcp -h 127.0.0.1 -p 12350"); adapter->add(new SSLPermissionsVerifierI, communicator()->stringToIdentity("sslverifier")); adapter->add(new SessionManagerI, communicator()->stringToIdentity("sessionmanager")); adapter->add(new SSLSessionManagerI, communicator()->stringToIdentity("sslsessionmanager")); diff --git a/cpp/test/Glacier2/ssl/run.py b/cpp/test/Glacier2/ssl/run.py index 14f10c06f14..e4654ac785d 100755 --- a/cpp/test/Glacier2/ssl/run.py +++ b/cpp/test/Glacier2/ssl/run.py @@ -30,14 +30,14 @@ router = os.path.join(TestUtil.getCppBinDir(), "glacier2router") args = ' --Ice.Warn.Dispatch=0' + \ ' --Glacier2.AddSSLContext=1' + \ - ' --Glacier2.Client.Endpoints="tcp -h 127.0.0.1 -p 12347 -t 10000:ssl -h 127.0.0.1 -p 12348 -t 10000"' + \ - ' --Glacier2.Server.Endpoints="tcp -h 127.0.0.1 -t 10000"' \ - ' --Ice.Admin.Endpoints="tcp -h 127.0.0.1 -p 12349 -t 10000"' + \ + ' --Glacier2.Client.Endpoints="tcp -h 127.0.0.1 -p 12347:ssl -h 127.0.0.1 -p 12348"' + \ + ' --Glacier2.Server.Endpoints="tcp -h 127.0.0.1"' \ + ' --Ice.Admin.Endpoints="tcp -h 127.0.0.1 -p 12349"' + \ ' --Ice.Admin.InstanceName=Glacier2' + \ - ' --Glacier2.SessionManager="sessionmanager:tcp -h 127.0.0.1 -p 12350 -t 10000"' + \ + ' --Glacier2.SessionManager="sessionmanager:tcp -h 127.0.0.1 -p 12350"' + \ ' --Glacier2.PermissionsVerifier="Glacier2/NullPermissionsVerifier"' + \ - ' --Glacier2.SSLSessionManager="sslsessionmanager:tcp -h 127.0.0.1 -p 12350 -t 10000"' + \ - ' --Glacier2.SSLPermissionsVerifier="sslverifier:tcp -h 127.0.0.1 -p 12350 -t 10000"' + ' --Glacier2.SSLSessionManager="sslsessionmanager:tcp -h 127.0.0.1 -p 12350"' + \ + ' --Glacier2.SSLPermissionsVerifier="sslverifier:tcp -h 127.0.0.1 -p 12350"' routerCfg = TestUtil.DriverConfig("server") routerCfg.protocol = "ssl" @@ -56,3 +56,5 @@ clientProc.startReader() clientProc.waitTestSuccess() serverProc.waitTestSuccess() starterProc.waitTestSuccess() + +TestUtil.cleanup() diff --git a/cpp/test/Glacier2/staticFiltering/Client.cpp b/cpp/test/Glacier2/staticFiltering/Client.cpp index 0c87fe89c7a..6dc3d7c3770 100644 --- a/cpp/test/Glacier2/staticFiltering/Client.cpp +++ b/cpp/test/Glacier2/staticFiltering/Client.cpp @@ -46,7 +46,7 @@ main(int argc, char* argv[]) int AttackClient::run(int argc, char* argv[]) { - ObjectPrx routerBase = communicator()->stringToProxy("Glacier2/router:default -p 12347 -t 60000"); + ObjectPrx routerBase = communicator()->stringToProxy("Glacier2/router:default -p 12347"); Glacier2::RouterPrx router = Glacier2::RouterPrx::checkedCast(routerBase); test(router); communicator()->setDefaultRouter(router); @@ -144,7 +144,7 @@ AttackClient::run(int argc, char* argv[]) communicator()->setDefaultRouter(0); try { - BackendPrx backend = BackendPrx::checkedCast(communicator()->stringToProxy("dummy:tcp -p 12010 -t 60000")); + BackendPrx backend = BackendPrx::checkedCast(communicator()->stringToProxy("dummy:tcp -p 12010")); backend->shutdown(); } catch(const Ice::LocalException&) @@ -152,7 +152,7 @@ AttackClient::run(int argc, char* argv[]) test(false); } - ObjectPrx processBase = communicator()->stringToProxy("Glacier2/admin -f Process:tcp -h 127.0.0.1 -p 12348 -t 60000"); + ObjectPrx processBase = communicator()->stringToProxy("Glacier2/admin -f Process:tcp -h 127.0.0.1 -p 12348"); Ice::ProcessPrx process = Ice::ProcessPrx::checkedCast(processBase); test(process); process->shutdown(); diff --git a/cpp/test/Glacier2/staticFiltering/Server.cpp b/cpp/test/Glacier2/staticFiltering/Server.cpp index 0bd96ffcc83..67621374cd7 100644 --- a/cpp/test/Glacier2/staticFiltering/Server.cpp +++ b/cpp/test/Glacier2/staticFiltering/Server.cpp @@ -126,9 +126,8 @@ main(int argc, char* argv[]) int BackendServer::run(int argc, char* argv[]) { - string endpoints = - communicator()->getProperties()->getPropertyWithDefault("BackendAdapter.Endpoints", - "tcp -p 12010 -t 20000:ssl -p 12011 -t 20000"); + string endpoints = communicator()->getProperties()->getPropertyWithDefault("BackendAdapter.Endpoints", + "tcp -p 12010:ssl -p 12011"); communicator()->getProperties()->setProperty("BackendAdapter.Endpoints", endpoints); ObjectAdapterPtr adapter = communicator()->createObjectAdapter("BackendAdapter"); diff --git a/cpp/test/Glacier2/staticFiltering/run.py b/cpp/test/Glacier2/staticFiltering/run.py index 24a35181cf5..f08014112a5 100755 --- a/cpp/test/Glacier2/staticFiltering/run.py +++ b/cpp/test/Glacier2/staticFiltering/run.py @@ -273,8 +273,8 @@ for testcase in testcases: # routerArgs = " --Ice.Config=" + os.path.join(os.getcwd(), "router.cfg") + \ - ' --Glacier2.Client.Endpoints="default -p 12347 -t 60000"' + \ - ' --Ice.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348 -t 60000"' + \ + ' --Glacier2.Client.Endpoints="default -p 12347"' + \ + ' --Ice.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348"' + \ ' --Ice.Admin.InstanceName=Glacier2' + \ ' --Glacier2.CryptPasswords="' + os.path.join(os.getcwd(), "passwords") + '"' @@ -322,7 +322,7 @@ for testcase in testcases: if TestUtil.protocol != "ssl": serverConfig = file(os.path.join(os.getcwd(), "server.cfg"), "w") serverOptions = ' --Ice.Config=' + os.path.join(os.getcwd(), "server.cfg") + " " - serverConfig.write("BackendAdapter.Endpoints=tcp -p 12010 -t 20000\n") + serverConfig.write("BackendAdapter.Endpoints=tcp -p 12010\n") serverConfig.close() else: serverOptions = "" @@ -352,3 +352,5 @@ for testcase in testcases: clientProc.waitTestSuccess() serverProc.waitTestSuccess() starterProc.waitTestSuccess() + +TestUtil.cleanup() diff --git a/cpp/test/Ice/adapterDeactivation/AllTests.cpp b/cpp/test/Ice/adapterDeactivation/AllTests.cpp index 8ce4164ef42..17d19743457 100644 --- a/cpp/test/Ice/adapterDeactivation/AllTests.cpp +++ b/cpp/test/Ice/adapterDeactivation/AllTests.cpp @@ -19,7 +19,7 @@ TestIntfPrx allTests(const CommunicatorPtr& communicator) { cout << "testing stringToProxy... " << flush; - ObjectPrx base = communicator->stringToProxy("test:default -p 12010 -t 10000"); + ObjectPrx base = communicator->stringToProxy("test:default -p 12010"); test(base); cout << "ok" << endl; diff --git a/cpp/test/Ice/adapterDeactivation/Collocated.cpp b/cpp/test/Ice/adapterDeactivation/Collocated.cpp index 15d5e0c29b9..da872819318 100644 --- a/cpp/test/Ice/adapterDeactivation/Collocated.cpp +++ b/cpp/test/Ice/adapterDeactivation/Collocated.cpp @@ -33,7 +33,7 @@ main(int argc, char* argv[]) int TestServer::run(int argc, char* argv[]) { - communicator()->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator()->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter"); ServantLocatorPtr locator = new ServantLocatorI; adapter->addServantLocator(locator, ""); diff --git a/cpp/test/Ice/adapterDeactivation/Server.cpp b/cpp/test/Ice/adapterDeactivation/Server.cpp index 8a20e8144b8..6c173d3ec83 100644 --- a/cpp/test/Ice/adapterDeactivation/Server.cpp +++ b/cpp/test/Ice/adapterDeactivation/Server.cpp @@ -31,7 +31,7 @@ main(int argc, char* argv[]) int TestServer::run(int argc, char* argv[]) { - communicator()->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); + communicator()->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter"); ServantLocatorPtr locator = new ServantLocatorI; diff --git a/cpp/test/Ice/adapterDeactivation/run.py b/cpp/test/Ice/adapterDeactivation/run.py index 545214a74c7..979b91c2544 100755 --- a/cpp/test/Ice/adapterDeactivation/run.py +++ b/cpp/test/Ice/adapterDeactivation/run.py @@ -22,3 +22,5 @@ from scripts import * TestUtil.clientServerTest() TestUtil.collocatedTest() + +TestUtil.cleanup() diff --git a/cpp/test/Ice/background/AllTests.cpp b/cpp/test/Ice/background/AllTests.cpp index 1f2c9e6b6b1..dedf41ffbf0 100644 --- a/cpp/test/Ice/background/AllTests.cpp +++ b/cpp/test/Ice/background/AllTests.cpp @@ -245,13 +245,13 @@ void readWriteTests(const ConfigurationPtr&, const Test::BackgroundPrx&, const T BackgroundPrx allTests(const Ice::CommunicatorPtr& communicator) { - string sref = "background:default -p 12010 -t 20000"; + string sref = "background:default -p 12010"; Ice::ObjectPrx obj = communicator->stringToProxy(sref); test(obj); BackgroundPrx background = BackgroundPrx::uncheckedCast(obj); - sref = "backgroundController:tcp -p 12011 -t 20000"; + sref = "backgroundController:tcp -p 12011"; obj = communicator->stringToProxy(sref); test(obj); @@ -303,7 +303,7 @@ allTests(const Ice::CommunicatorPtr& communicator) } backgroundController->resumeCall("findAdapterById"); - obj = communicator->stringToProxy("locator:default -p 12010 -t 10000"); + obj = communicator->stringToProxy("locator:default -p 12010"); locator = Ice::LocatorPrx::uncheckedCast(obj); obj = obj->ice_locator(locator); obj->ice_ping(); @@ -343,7 +343,7 @@ allTests(const Ice::CommunicatorPtr& communicator) } backgroundController->resumeCall("getClientProxy"); - obj = communicator->stringToProxy("router:default -p 12010 -t 10000"); + obj = communicator->stringToProxy("router:default -p 12010"); router = Ice::RouterPrx::uncheckedCast(obj); obj = communicator->stringToProxy("background@Test")->ice_router(router); BackgroundPrx bg = BackgroundPrx::uncheckedCast(obj); diff --git a/cpp/test/Ice/background/Server.cpp b/cpp/test/Ice/background/Server.cpp index 76a316d2f44..756c15f6b64 100644 --- a/cpp/test/Ice/background/Server.cpp +++ b/cpp/test/Ice/background/Server.cpp @@ -98,7 +98,7 @@ private: int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { - communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010"); communicator->getProperties()->setProperty("ControllerAdapter.Endpoints", "tcp -p 12011"); communicator->getProperties()->setProperty("ControllerAdapter.ThreadPool.Size", "1"); diff --git a/cpp/test/Ice/background/run.py b/cpp/test/Ice/background/run.py index bb34e7d35b7..56d48e628de 100755 --- a/cpp/test/Ice/background/run.py +++ b/cpp/test/Ice/background/run.py @@ -21,3 +21,5 @@ sys.path.append(os.path.join(path[0])) from scripts import * TestUtil.clientServerTest() + +TestUtil.cleanup() diff --git a/cpp/test/Ice/binding/AllTests.cpp b/cpp/test/Ice/binding/AllTests.cpp index b277d8f0b52..dc9c8f0c3f0 100644 --- a/cpp/test/Ice/binding/AllTests.cpp +++ b/cpp/test/Ice/binding/AllTests.cpp @@ -111,7 +111,7 @@ deactivate(const RemoteCommunicatorPrx& com, vector<RemoteObjectAdapterPrx>& ada void allTests(const Ice::CommunicatorPtr& communicator) { - string ref = "communicator:default -p 12010 -t 10000"; + string ref = "communicator:default -p 12010"; RemoteCommunicatorPrx com = RemoteCommunicatorPrx::uncheckedCast(communicator->stringToProxy(ref)); RandomNumberGenerator rng; diff --git a/cpp/test/Ice/binding/Server.cpp b/cpp/test/Ice/binding/Server.cpp index a1cfe19e968..41a3cd196a8 100644 --- a/cpp/test/Ice/binding/Server.cpp +++ b/cpp/test/Ice/binding/Server.cpp @@ -15,7 +15,7 @@ using namespace std; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { - communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); + communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::Identity id = communicator->stringToIdentity("communicator"); adapter->add(new RemoteCommunicatorI(), id); diff --git a/cpp/test/Ice/binding/run.py b/cpp/test/Ice/binding/run.py index bb34e7d35b7..56d48e628de 100755 --- a/cpp/test/Ice/binding/run.py +++ b/cpp/test/Ice/binding/run.py @@ -21,3 +21,5 @@ sys.path.append(os.path.join(path[0])) from scripts import * TestUtil.clientServerTest() + +TestUtil.cleanup() diff --git a/cpp/test/Ice/checksum/AllTests.cpp b/cpp/test/Ice/checksum/AllTests.cpp index ddac9b3242d..3dd6b287cd6 100644 --- a/cpp/test/Ice/checksum/AllTests.cpp +++ b/cpp/test/Ice/checksum/AllTests.cpp @@ -17,7 +17,7 @@ using namespace std; Test::ChecksumPrx allTests(const Ice::CommunicatorPtr& communicator, bool collocated) { - string ref = "test:default -p 12010 -t 10000"; + string ref = "test:default -p 12010"; Ice::ObjectPrx base = communicator->stringToProxy(ref); test(base); diff --git a/cpp/test/Ice/checksum/run.py b/cpp/test/Ice/checksum/run.py index ba52f388067..d0a42ae3d24 100755 --- a/cpp/test/Ice/checksum/run.py +++ b/cpp/test/Ice/checksum/run.py @@ -22,3 +22,5 @@ from scripts import * server = os.path.join(os.getcwd(), "server", "server") TestUtil.clientServerTest(server = server) + +TestUtil.cleanup() diff --git a/cpp/test/Ice/custom/AllTests.cpp b/cpp/test/Ice/custom/AllTests.cpp index 5846917f591..88bdb6689c7 100644 --- a/cpp/test/Ice/custom/AllTests.cpp +++ b/cpp/test/Ice/custom/AllTests.cpp @@ -1038,7 +1038,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) { cout << "testing stringToProxy... " << flush; string ref = communicator->getProperties()->getPropertyWithDefault( - "Custom.Proxy", "test:default -p 12010 -t 10000"); + "Custom.Proxy", "test:default -p 12010"); Ice::ObjectPrx base = communicator->stringToProxy(ref); test(base); cout << "ok" << endl; @@ -2008,14 +2008,14 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) wdict2 = wdict1; ref = communicator->getProperties()->getPropertyWithDefault( - "Custom.WstringProxy1", "wstring1:default -p 12010 -t 10000"); + "Custom.WstringProxy1", "wstring1:default -p 12010"); base = communicator->stringToProxy(ref); test(base); Test1::WstringClassPrx wsc1 = Test1::WstringClassPrx::checkedCast(base); test(t); ref = communicator->getProperties()->getPropertyWithDefault( - "Custom.WstringProxy2", "wstring2:default -p 12010 -t 10000"); + "Custom.WstringProxy2", "wstring2:default -p 12010"); base = communicator->stringToProxy(ref); test(base); Test2::WstringClassPrx wsc2 = Test2::WstringClassPrx::checkedCast(base); diff --git a/cpp/test/Ice/custom/Collocated.cpp b/cpp/test/Ice/custom/Collocated.cpp index f3e7aa1aea9..9dcaa9537d2 100644 --- a/cpp/test/Ice/custom/Collocated.cpp +++ b/cpp/test/Ice/custom/Collocated.cpp @@ -40,7 +40,7 @@ main(int argc, char** argv) { Ice::InitializationData initData; initData.properties = Ice::createProperties(argc, argv); - initData.properties->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + initData.properties->setProperty("TestAdapter.Endpoints", "default -p 12010"); initData.stringConverter = new Test::StringConverterI(); initData.wstringConverter = new Test::WstringConverterI(); communicator = Ice::initialize(argc, argv, initData); diff --git a/cpp/test/Ice/custom/Server.cpp b/cpp/test/Ice/custom/Server.cpp index 13e9f6ee8a3..cdbb6e3befb 100644 --- a/cpp/test/Ice/custom/Server.cpp +++ b/cpp/test/Ice/custom/Server.cpp @@ -39,7 +39,7 @@ main(int argc, char** argv) { Ice::InitializationData initData; initData.properties = Ice::createProperties(argc, argv); - initData.properties->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + initData.properties->setProperty("TestAdapter.Endpoints", "default -p 12010"); initData.stringConverter = new Test::StringConverterI(); initData.wstringConverter = new Test::WstringConverterI(); communicator = Ice::initialize(argc, argv, initData); diff --git a/cpp/test/Ice/custom/ServerAMD.cpp b/cpp/test/Ice/custom/ServerAMD.cpp index 27b6caedb47..046c82a72aa 100644 --- a/cpp/test/Ice/custom/ServerAMD.cpp +++ b/cpp/test/Ice/custom/ServerAMD.cpp @@ -40,7 +40,7 @@ main(int argc, char** argv) Ice::InitializationData initData; initData.properties = Ice::createProperties(argc, argv); - initData.properties->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + initData.properties->setProperty("TestAdapter.Endpoints", "default -p 12010"); initData.stringConverter = new Test::StringConverterI(); initData.wstringConverter = new Test::WstringConverterI(); communicator = Ice::initialize(argc, argv, initData); diff --git a/cpp/test/Ice/custom/run.py b/cpp/test/Ice/custom/run.py index 8b6d12458d7..e0779dbf6d2 100755 --- a/cpp/test/Ice/custom/run.py +++ b/cpp/test/Ice/custom/run.py @@ -26,3 +26,5 @@ print "tests with AMD server." TestUtil.clientServerTest(server = "serveramd") print "tests with collocated server." TestUtil.collocatedTest() + +TestUtil.cleanup() diff --git a/cpp/test/Ice/defaultServant/run.py b/cpp/test/Ice/defaultServant/run.py index e2a84c8cd83..e46056e57f0 100755 --- a/cpp/test/Ice/defaultServant/run.py +++ b/cpp/test/Ice/defaultServant/run.py @@ -23,3 +23,5 @@ from scripts import * client = os.path.join(os.getcwd(), "client") TestUtil.simpleTest(client) + +TestUtil.cleanup() diff --git a/cpp/test/Ice/exceptions/AllTests.cpp b/cpp/test/Ice/exceptions/AllTests.cpp index bb89a0611d9..9c5f64c2eb4 100644 --- a/cpp/test/Ice/exceptions/AllTests.cpp +++ b/cpp/test/Ice/exceptions/AllTests.cpp @@ -648,7 +648,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) try { Ice::ObjectAdapterPtr second = - communicator->createObjectAdapterWithEndpoints("TestAdapter0", "ssl -h foo -p 12011 -t 10000"); + communicator->createObjectAdapterWithEndpoints("TestAdapter0", "ssl -h foo -p 12011"); test(false); } catch(const Ice::AlreadyRegisteredException&) @@ -733,7 +733,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) cout << "ok" << endl; cout << "testing stringToProxy... " << flush; - string ref = "thrower:default -p 12010 -t 10000"; + string ref = "thrower:default -p 12010"; Ice::ObjectPrx base = communicator->stringToProxy(ref); test(base); cout << "ok" << endl; diff --git a/cpp/test/Ice/exceptions/Collocated.cpp b/cpp/test/Ice/exceptions/Collocated.cpp index 4a636ba458f..1c6e1a8e241 100644 --- a/cpp/test/Ice/exceptions/Collocated.cpp +++ b/cpp/test/Ice/exceptions/Collocated.cpp @@ -16,7 +16,7 @@ using namespace Test; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { - communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::ObjectPtr object = new ThrowerI(adapter); adapter->add(object, communicator->stringToIdentity("thrower")); diff --git a/cpp/test/Ice/exceptions/Server.cpp b/cpp/test/Ice/exceptions/Server.cpp index 48c08627983..683e1cd610d 100644 --- a/cpp/test/Ice/exceptions/Server.cpp +++ b/cpp/test/Ice/exceptions/Server.cpp @@ -17,7 +17,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { Ice::PropertiesPtr properties = communicator->getProperties(); properties->setProperty("Ice.Warn.Dispatch", "0"); - communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); + communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::ObjectPtr object = new ThrowerI(adapter); adapter->add(object, communicator->stringToIdentity("thrower")); diff --git a/cpp/test/Ice/exceptions/ServerAMD.cpp b/cpp/test/Ice/exceptions/ServerAMD.cpp index 9ee5097a071..3351451e205 100644 --- a/cpp/test/Ice/exceptions/ServerAMD.cpp +++ b/cpp/test/Ice/exceptions/ServerAMD.cpp @@ -17,7 +17,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { Ice::PropertiesPtr properties = communicator->getProperties(); properties->setProperty("Ice.Warn.Dispatch", "0"); - communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); + communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::ObjectPtr object = new ThrowerI(adapter); adapter->add(object, communicator->stringToIdentity("thrower")); diff --git a/cpp/test/Ice/exceptions/run.py b/cpp/test/Ice/exceptions/run.py index 8b6d12458d7..e0779dbf6d2 100755 --- a/cpp/test/Ice/exceptions/run.py +++ b/cpp/test/Ice/exceptions/run.py @@ -26,3 +26,5 @@ print "tests with AMD server." TestUtil.clientServerTest(server = "serveramd") print "tests with collocated server." TestUtil.collocatedTest() + +TestUtil.cleanup() diff --git a/cpp/test/Ice/facets/AllTests.cpp b/cpp/test/Ice/facets/AllTests.cpp index 455adaa6055..79ea855329d 100644 --- a/cpp/test/Ice/facets/AllTests.cpp +++ b/cpp/test/Ice/facets/AllTests.cpp @@ -107,7 +107,7 @@ allTests(const Ice::CommunicatorPtr& communicator) adapter->deactivate(); cout << "testing stringToProxy... " << flush; - string ref = "d:default -p 12010 -t 10000"; + string ref = "d:default -p 12010"; Ice::ObjectPrx db = communicator->stringToProxy(ref); test(db); cout << "ok" << endl; diff --git a/cpp/test/Ice/facets/Collocated.cpp b/cpp/test/Ice/facets/Collocated.cpp index 847f63b0f69..5a67b0c82a2 100644 --- a/cpp/test/Ice/facets/Collocated.cpp +++ b/cpp/test/Ice/facets/Collocated.cpp @@ -16,7 +16,7 @@ using namespace Test; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { - communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::ObjectPtr d = new DI; adapter->add(d, communicator->stringToIdentity("d")); diff --git a/cpp/test/Ice/facets/Server.cpp b/cpp/test/Ice/facets/Server.cpp index 11b02cc050e..58e760b270f 100644 --- a/cpp/test/Ice/facets/Server.cpp +++ b/cpp/test/Ice/facets/Server.cpp @@ -15,7 +15,7 @@ using namespace std; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { - communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::ObjectPtr d = new DI; adapter->add(d, communicator->stringToIdentity("d")); diff --git a/cpp/test/Ice/facets/run.py b/cpp/test/Ice/facets/run.py index 545214a74c7..979b91c2544 100755 --- a/cpp/test/Ice/facets/run.py +++ b/cpp/test/Ice/facets/run.py @@ -22,3 +22,5 @@ from scripts import * TestUtil.clientServerTest() TestUtil.collocatedTest() + +TestUtil.cleanup() diff --git a/cpp/test/Ice/faultTolerance/AllTests.cpp b/cpp/test/Ice/faultTolerance/AllTests.cpp index d103f3f72b6..596cd250a56 100644 --- a/cpp/test/Ice/faultTolerance/AllTests.cpp +++ b/cpp/test/Ice/faultTolerance/AllTests.cpp @@ -170,7 +170,7 @@ allTests(const Ice::CommunicatorPtr& communicator, const vector<int>& ports) ref << "test"; for(vector<int>::const_iterator p = ports.begin(); p != ports.end(); ++p) { - ref << ":default -t 60000 -p " << *p; + ref << ":default -p " << *p; } Ice::ObjectPrx base = communicator->stringToProxy(ref.str()); test(base); diff --git a/cpp/test/Ice/faultTolerance/run.py b/cpp/test/Ice/faultTolerance/run.py index bf53108dc06..57e86835cf5 100755 --- a/cpp/test/Ice/faultTolerance/run.py +++ b/cpp/test/Ice/faultTolerance/run.py @@ -44,3 +44,5 @@ clientProc.startReader() clientProc.waitTestSuccess() for p in serverProc: p.waitTestSuccess() + +TestUtil.cleanup() diff --git a/cpp/test/Ice/gc/run.py b/cpp/test/Ice/gc/run.py index 2fbebfbbb8a..c19f72b7a52 100755 --- a/cpp/test/Ice/gc/run.py +++ b/cpp/test/Ice/gc/run.py @@ -27,3 +27,5 @@ seedfile = os.path.join(os.getcwd(), "seed") TestUtil.simpleTest(client, seedfile) os.remove(seedfile) + +TestUtil.cleanup() diff --git a/cpp/test/Ice/hold/AllTests.cpp b/cpp/test/Ice/hold/AllTests.cpp index e0eadceefc8..e6f7a1b55a4 100644 --- a/cpp/test/Ice/hold/AllTests.cpp +++ b/cpp/test/Ice/hold/AllTests.cpp @@ -112,10 +112,10 @@ void allTests(const Ice::CommunicatorPtr& communicator) { cout << "testing stringToProxy... " << flush; - string ref = "hold:default -p 12010 -t 30000"; + string ref = "hold:default -p 12010"; Ice::ObjectPrx base = communicator->stringToProxy(ref); test(base); - string refSerialized = "hold:default -p 12011 -t 60000"; + string refSerialized = "hold:default -p 12011"; Ice::ObjectPrx baseSerialized = communicator->stringToProxy(refSerialized); test(base); cout << "ok" << endl; diff --git a/cpp/test/Ice/hold/Server.cpp b/cpp/test/Ice/hold/Server.cpp index 6f90c9b5012..d45200b1b3b 100644 --- a/cpp/test/Ice/hold/Server.cpp +++ b/cpp/test/Ice/hold/Server.cpp @@ -17,7 +17,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { IceUtil::TimerPtr timer = new IceUtil::Timer(); - communicator->getProperties()->setProperty("TestAdapter1.Endpoints", "default -p 12010 -t 10000:udp"); + communicator->getProperties()->setProperty("TestAdapter1.Endpoints", "default -p 12010:udp"); communicator->getProperties()->setProperty("TestAdapter1.ThreadPool.Size", "5"); communicator->getProperties()->setProperty("TestAdapter1.ThreadPool.SizeMax", "5"); communicator->getProperties()->setProperty("TestAdapter1.ThreadPool.SizeWarn", "0"); @@ -25,7 +25,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) Ice::ObjectAdapterPtr adapter1 = communicator->createObjectAdapter("TestAdapter1"); adapter1->add(new HoldI(timer, adapter1), communicator->stringToIdentity("hold")); - communicator->getProperties()->setProperty("TestAdapter2.Endpoints", "default -p 12011 -t 10000:udp"); + communicator->getProperties()->setProperty("TestAdapter2.Endpoints", "default -p 12011:udp"); communicator->getProperties()->setProperty("TestAdapter2.ThreadPool.Size", "5"); communicator->getProperties()->setProperty("TestAdapter2.ThreadPool.SizeMax", "5"); communicator->getProperties()->setProperty("TestAdapter2.ThreadPool.SizeWarn", "0"); diff --git a/cpp/test/Ice/hold/run.py b/cpp/test/Ice/hold/run.py index bb34e7d35b7..56d48e628de 100755 --- a/cpp/test/Ice/hold/run.py +++ b/cpp/test/Ice/hold/run.py @@ -21,3 +21,5 @@ sys.path.append(os.path.join(path[0])) from scripts import * TestUtil.clientServerTest() + +TestUtil.cleanup() diff --git a/cpp/test/Ice/inheritance/AllTests.cpp b/cpp/test/Ice/inheritance/AllTests.cpp index 5e879721c1d..7c92369eeab 100644 --- a/cpp/test/Ice/inheritance/AllTests.cpp +++ b/cpp/test/Ice/inheritance/AllTests.cpp @@ -18,7 +18,7 @@ InitialPrx allTests(const Ice::CommunicatorPtr& communicator) { cout << "testing stringToProxy... " << flush; - string ref = "initial:default -p 12010 -t 10000"; + string ref = "initial:default -p 12010"; Ice::ObjectPrx base = communicator->stringToProxy(ref); test(base); cout << "ok" << endl; diff --git a/cpp/test/Ice/inheritance/Collocated.cpp b/cpp/test/Ice/inheritance/Collocated.cpp index 3d22c775e7f..3e4f4f7e678 100644 --- a/cpp/test/Ice/inheritance/Collocated.cpp +++ b/cpp/test/Ice/inheritance/Collocated.cpp @@ -16,7 +16,7 @@ using namespace Test; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { - communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::ObjectPtr object = new InitialI(adapter); adapter->add(object, communicator->stringToIdentity("initial")); diff --git a/cpp/test/Ice/inheritance/Server.cpp b/cpp/test/Ice/inheritance/Server.cpp index 6d8ed92c695..df28b3d8d28 100644 --- a/cpp/test/Ice/inheritance/Server.cpp +++ b/cpp/test/Ice/inheritance/Server.cpp @@ -15,7 +15,7 @@ using namespace std; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { - communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::ObjectPtr object = new InitialI(adapter); adapter->add(object, communicator->stringToIdentity("initial")); diff --git a/cpp/test/Ice/inheritance/run.py b/cpp/test/Ice/inheritance/run.py index 545214a74c7..979b91c2544 100755 --- a/cpp/test/Ice/inheritance/run.py +++ b/cpp/test/Ice/inheritance/run.py @@ -22,3 +22,5 @@ from scripts import * TestUtil.clientServerTest() TestUtil.collocatedTest() + +TestUtil.cleanup() diff --git a/cpp/test/Ice/interceptor/run.py b/cpp/test/Ice/interceptor/run.py index cc291cb1472..8dc7158f9da 100755 --- a/cpp/test/Ice/interceptor/run.py +++ b/cpp/test/Ice/interceptor/run.py @@ -23,3 +23,5 @@ from scripts import * client = os.path.join(os.getcwd(), "client") TestUtil.simpleTest(client, " --Ice.Warn.Dispatch=0") + +TestUtil.cleanup() diff --git a/cpp/test/Ice/location/Client.cpp b/cpp/test/Ice/location/Client.cpp index f539313d775..a8f8977b2bf 100644 --- a/cpp/test/Ice/location/Client.cpp +++ b/cpp/test/Ice/location/Client.cpp @@ -17,7 +17,7 @@ int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { void allTests(const Ice::CommunicatorPtr&, const string&); - allTests(communicator, "ServerManager:default -p 12010 -t 10000"); + allTests(communicator, "ServerManager:default -p 12010"); return EXIT_SUCCESS; } diff --git a/cpp/test/Ice/location/run.py b/cpp/test/Ice/location/run.py index bb34e7d35b7..56d48e628de 100755 --- a/cpp/test/Ice/location/run.py +++ b/cpp/test/Ice/location/run.py @@ -21,3 +21,5 @@ sys.path.append(os.path.join(path[0])) from scripts import * TestUtil.clientServerTest() + +TestUtil.cleanup() diff --git a/cpp/test/Ice/objects/AllTests.cpp b/cpp/test/Ice/objects/AllTests.cpp index 94461b365ab..4e87bedf810 100644 --- a/cpp/test/Ice/objects/AllTests.cpp +++ b/cpp/test/Ice/objects/AllTests.cpp @@ -18,7 +18,7 @@ InitialPrx allTests(const Ice::CommunicatorPtr& communicator, bool collocated) { cout << "testing stringToProxy... " << flush; - string ref = "initial:default -p 12010 -t 10000"; + string ref = "initial:default -p 12010"; Ice::ObjectPrx base = communicator->stringToProxy(ref); test(base); cout << "ok" << endl; @@ -164,7 +164,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) if(!collocated) { cout << "testing UnexpectedObjectException... " << flush; - ref = "uoet:default -p 12010 -t 10000"; + ref = "uoet:default -p 12010"; base = communicator->stringToProxy(ref); test(base); UnexpectedObjectExceptionTestPrx uoet = UnexpectedObjectExceptionTestPrx::uncheckedCast(base); diff --git a/cpp/test/Ice/objects/Collocated.cpp b/cpp/test/Ice/objects/Collocated.cpp index 4768eda710f..693b43c850c 100644 --- a/cpp/test/Ice/objects/Collocated.cpp +++ b/cpp/test/Ice/objects/Collocated.cpp @@ -16,7 +16,7 @@ using namespace Test; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { - communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); InitialPtr initial = new InitialI(adapter); adapter->add(initial, communicator->stringToIdentity("initial")); diff --git a/cpp/test/Ice/objects/Server.cpp b/cpp/test/Ice/objects/Server.cpp index 5bb0dcfc9bb..7ecdbaa4bf4 100644 --- a/cpp/test/Ice/objects/Server.cpp +++ b/cpp/test/Ice/objects/Server.cpp @@ -50,7 +50,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) communicator->addObjectFactory(factory, "::Test::J"); communicator->addObjectFactory(factory, "::Test::H"); - communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); InitialPtr initial = new InitialI(adapter); adapter->add(initial, communicator->stringToIdentity("initial")); diff --git a/cpp/test/Ice/objects/run.py b/cpp/test/Ice/objects/run.py index 545214a74c7..979b91c2544 100755 --- a/cpp/test/Ice/objects/run.py +++ b/cpp/test/Ice/objects/run.py @@ -22,3 +22,5 @@ from scripts import * TestUtil.clientServerTest() TestUtil.collocatedTest() + +TestUtil.cleanup() diff --git a/cpp/test/Ice/operations/AllTests.cpp b/cpp/test/Ice/operations/AllTests.cpp index 568de3a52bc..7c38085439f 100644 --- a/cpp/test/Ice/operations/AllTests.cpp +++ b/cpp/test/Ice/operations/AllTests.cpp @@ -17,7 +17,7 @@ using namespace std; Test::MyClassPrx allTests(const Ice::CommunicatorPtr& communicator, bool collocated) { - string ref = "test:default -p 12010 -t 10000"; + string ref = "test:default -p 12010"; Ice::ObjectPrx base = communicator->stringToProxy(ref); Test::MyClassPrx cl = Test::MyClassPrx::checkedCast(base); Test::MyDerivedClassPrx derived = Test::MyDerivedClassPrx::checkedCast(cl); diff --git a/cpp/test/Ice/operations/Collocated.cpp b/cpp/test/Ice/operations/Collocated.cpp index 187e0dd2fa3..f8c37d3c08b 100644 --- a/cpp/test/Ice/operations/Collocated.cpp +++ b/cpp/test/Ice/operations/Collocated.cpp @@ -16,7 +16,7 @@ int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator, const Ice::InitializationData& initData) { - communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); adapter->add(new MyDerivedClassI, communicator->stringToIdentity("test")); adapter->activate(); diff --git a/cpp/test/Ice/operations/Server.cpp b/cpp/test/Ice/operations/Server.cpp index 58119af02b0..af451ce4bbf 100644 --- a/cpp/test/Ice/operations/Server.cpp +++ b/cpp/test/Ice/operations/Server.cpp @@ -15,7 +15,7 @@ using namespace std; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { - communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); + communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); adapter->add(new MyDerivedClassI, communicator->stringToIdentity("test")); adapter->activate(); diff --git a/cpp/test/Ice/operations/ServerAMD.cpp b/cpp/test/Ice/operations/ServerAMD.cpp index a86331941ac..253f0c2a801 100644 --- a/cpp/test/Ice/operations/ServerAMD.cpp +++ b/cpp/test/Ice/operations/ServerAMD.cpp @@ -15,7 +15,7 @@ using namespace std; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { - communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); + communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); adapter->add(new MyDerivedClassI, communicator->stringToIdentity("test")); adapter->activate(); diff --git a/cpp/test/Ice/operations/Twoways.cpp b/cpp/test/Ice/operations/Twoways.cpp index ed6945dc735..b629b82c7a9 100644 --- a/cpp/test/Ice/operations/Twoways.cpp +++ b/cpp/test/Ice/operations/Twoways.cpp @@ -715,7 +715,7 @@ twoways(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) communicator->setDefaultContext(dflt); Test::MyClassPrx c = Test::MyClassPrx::checkedCast( - communicator->stringToProxy("test:default -p 12010 -t 10000")); + communicator->stringToProxy("test:default -p 12010")); test(c->opContext() == dflt); dflt["a"] = "c"; diff --git a/cpp/test/Ice/operations/TwowaysAMI.cpp b/cpp/test/Ice/operations/TwowaysAMI.cpp index f2809dda31e..6db2a5abee0 100644 --- a/cpp/test/Ice/operations/TwowaysAMI.cpp +++ b/cpp/test/Ice/operations/TwowaysAMI.cpp @@ -1347,7 +1347,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) communicator->setDefaultContext(dflt); Test::MyClassPrx c = Test::MyClassPrx::checkedCast( - communicator->stringToProxy("test:default -p 12010 -t 10000")); + communicator->stringToProxy("test:default -p 12010")); { Ice::Context tmp; tmp["a"] = "b"; diff --git a/cpp/test/Ice/operations/run.py b/cpp/test/Ice/operations/run.py index 8b6d12458d7..e0779dbf6d2 100755 --- a/cpp/test/Ice/operations/run.py +++ b/cpp/test/Ice/operations/run.py @@ -26,3 +26,5 @@ print "tests with AMD server." TestUtil.clientServerTest(server = "serveramd") print "tests with collocated server." TestUtil.collocatedTest() + +TestUtil.cleanup() diff --git a/cpp/test/Ice/proxy/AllTests.cpp b/cpp/test/Ice/proxy/AllTests.cpp index 599479af8c5..1dcec2205ac 100644 --- a/cpp/test/Ice/proxy/AllTests.cpp +++ b/cpp/test/Ice/proxy/AllTests.cpp @@ -19,7 +19,7 @@ Test::MyClassPrx allTests(const Ice::CommunicatorPtr& communicator) { cout << "testing stringToProxy... " << flush; - string ref = "test:default -p 12010 -t 10000"; + string ref = "test:default -p 12010"; Ice::ObjectPrx base = communicator->stringToProxy(ref); test(base); @@ -249,7 +249,7 @@ allTests(const Ice::CommunicatorPtr& communicator) cout << "testing propertyToProxy... " << flush; Ice::PropertiesPtr prop = communicator->getProperties(); string propertyPrefix = "Foo.Proxy"; - prop->setProperty(propertyPrefix, "test:default -p 12010 -t 10000"); + prop->setProperty(propertyPrefix, "test:default -p 12010"); b1 = communicator->propertyToProxy(propertyPrefix); test(b1->ice_getIdentity().name == "test" && b1->ice_getIdentity().category.empty() && b1->ice_getAdapterId().empty() && b1->ice_getFacet().empty()); @@ -293,7 +293,7 @@ allTests(const Ice::CommunicatorPtr& communicator) //test(b1->ice_getLocatorCacheTimeout() == 60); //prop->setProperty("Ice.Default.LocatorCacheTimeout", ""); - prop->setProperty(propertyPrefix, "test:default -p 12010 -t 10000"); + prop->setProperty(propertyPrefix, "test:default -p 12010"); property = propertyPrefix + ".Router"; test(!b1->ice_getRouter()); diff --git a/cpp/test/Ice/proxy/Collocated.cpp b/cpp/test/Ice/proxy/Collocated.cpp index 6791e6d01e5..a54574ab1b6 100644 --- a/cpp/test/Ice/proxy/Collocated.cpp +++ b/cpp/test/Ice/proxy/Collocated.cpp @@ -16,7 +16,7 @@ int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator, const Ice::InitializationData& initData) { - communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); adapter->add(new MyDerivedClassI, communicator->stringToIdentity("test")); adapter->activate(); diff --git a/cpp/test/Ice/proxy/Server.cpp b/cpp/test/Ice/proxy/Server.cpp index b049adb543b..13a28b6e838 100644 --- a/cpp/test/Ice/proxy/Server.cpp +++ b/cpp/test/Ice/proxy/Server.cpp @@ -15,7 +15,7 @@ using namespace std; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { - communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); + communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); adapter->add(new MyDerivedClassI, communicator->stringToIdentity("test")); adapter->activate(); diff --git a/cpp/test/Ice/proxy/ServerAMD.cpp b/cpp/test/Ice/proxy/ServerAMD.cpp index 24144c3155c..27c64c5b971 100644 --- a/cpp/test/Ice/proxy/ServerAMD.cpp +++ b/cpp/test/Ice/proxy/ServerAMD.cpp @@ -15,7 +15,7 @@ using namespace std; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { - communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); + communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); adapter->add(new MyDerivedClassI, communicator->stringToIdentity("test")); adapter->activate(); diff --git a/cpp/test/Ice/proxy/run.py b/cpp/test/Ice/proxy/run.py index 8b6d12458d7..e0779dbf6d2 100755 --- a/cpp/test/Ice/proxy/run.py +++ b/cpp/test/Ice/proxy/run.py @@ -26,3 +26,5 @@ print "tests with AMD server." TestUtil.clientServerTest(server = "serveramd") print "tests with collocated server." TestUtil.collocatedTest() + +TestUtil.cleanup() diff --git a/cpp/test/Ice/retry/AllTests.cpp b/cpp/test/Ice/retry/AllTests.cpp index 75534d4c271..d0b9b818d4f 100644 --- a/cpp/test/Ice/retry/AllTests.cpp +++ b/cpp/test/Ice/retry/AllTests.cpp @@ -95,7 +95,7 @@ RetryPrx allTests(const Ice::CommunicatorPtr& communicator) { cout << "testing stringToProxy... " << flush; - string ref = "retry:default -p 12010 -t 10000"; + string ref = "retry:default -p 12010"; Ice::ObjectPrx base1 = communicator->stringToProxy(ref); test(base1); Ice::ObjectPrx base2 = communicator->stringToProxy(ref); diff --git a/cpp/test/Ice/retry/Server.cpp b/cpp/test/Ice/retry/Server.cpp index 5defa4c5321..c09c401e00c 100644 --- a/cpp/test/Ice/retry/Server.cpp +++ b/cpp/test/Ice/retry/Server.cpp @@ -15,7 +15,7 @@ using namespace std; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { - communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); + communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::ObjectPtr object = new RetryI; adapter->add(object, communicator->stringToIdentity("retry")); diff --git a/cpp/test/Ice/retry/run.py b/cpp/test/Ice/retry/run.py index bb34e7d35b7..56d48e628de 100755 --- a/cpp/test/Ice/retry/run.py +++ b/cpp/test/Ice/retry/run.py @@ -21,3 +21,5 @@ sys.path.append(os.path.join(path[0])) from scripts import * TestUtil.clientServerTest() + +TestUtil.cleanup() diff --git a/cpp/test/Ice/servantLocator/AllTests.cpp b/cpp/test/Ice/servantLocator/AllTests.cpp index d9d1e6904e0..b98bc9844da 100644 --- a/cpp/test/Ice/servantLocator/AllTests.cpp +++ b/cpp/test/Ice/servantLocator/AllTests.cpp @@ -211,7 +211,7 @@ TestIntfPrx allTests(const CommunicatorPtr& communicator, bool collocated) { cout << "testing stringToProxy... " << flush; - ObjectPrx base = communicator->stringToProxy("asm:default -p 12010 -t 10000"); + ObjectPrx base = communicator->stringToProxy("asm:default -p 12010"); test(base); cout << "ok" << endl; @@ -224,7 +224,7 @@ allTests(const CommunicatorPtr& communicator, bool collocated) cout << "testing ice_ids... " << flush; try { - ObjectPrx o = communicator->stringToProxy("category/locate:default -p 12010 -t 10000"); + ObjectPrx o = communicator->stringToProxy("category/locate:default -p 12010"); o->ice_ids(); test(false); } @@ -239,7 +239,7 @@ allTests(const CommunicatorPtr& communicator, bool collocated) try { - ObjectPrx o = communicator->stringToProxy("category/finished:default -p 12010 -t 10000"); + ObjectPrx o = communicator->stringToProxy("category/finished:default -p 12010"); o->ice_ids(); test(false); } @@ -254,14 +254,14 @@ allTests(const CommunicatorPtr& communicator, bool collocated) cout << "ok" << endl; cout << "testing servant locator..." << flush; - base = communicator->stringToProxy("category/locate:default -p 12010 -t 10000"); + base = communicator->stringToProxy("category/locate:default -p 12010"); obj = TestIntfPrx::checkedCast(base); try { #if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) IceUtil::DummyBCC dummy; #endif - TestIntfPrx::checkedCast(communicator->stringToProxy("category/unknown:default -p 12010 -t 10000")); + TestIntfPrx::checkedCast(communicator->stringToProxy("category/unknown:default -p 12010")); } catch(const ObjectNotExistException&) { @@ -269,16 +269,16 @@ allTests(const CommunicatorPtr& communicator, bool collocated) cout << "ok" << endl; cout << "testing default servant locator..." << flush; - base = communicator->stringToProxy("anothercategory/locate:default -p 12010 -t 10000"); + base = communicator->stringToProxy("anothercategory/locate:default -p 12010"); obj = TestIntfPrx::checkedCast(base); - base = communicator->stringToProxy("locate:default -p 12010 -t 10000"); + base = communicator->stringToProxy("locate:default -p 12010"); obj = TestIntfPrx::checkedCast(base); try { #if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) IceUtil::DummyBCC dummy; #endif - TestIntfPrx::checkedCast(communicator->stringToProxy("anothercategory/unknown:default -p 12010 -t 10000")); + TestIntfPrx::checkedCast(communicator->stringToProxy("anothercategory/unknown:default -p 12010")); } catch(const ObjectNotExistException&) { @@ -288,7 +288,7 @@ allTests(const CommunicatorPtr& communicator, bool collocated) #if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600) IceUtil::DummyBCC dummy; #endif - TestIntfPrx::checkedCast(communicator->stringToProxy("unknown:default -p 12010 -t 10000")); + TestIntfPrx::checkedCast(communicator->stringToProxy("unknown:default -p 12010")); } catch(const Ice::ObjectNotExistException&) { @@ -296,13 +296,13 @@ allTests(const CommunicatorPtr& communicator, bool collocated) cout << "ok" << endl; cout << "testing locate exceptions... " << flush; - base = communicator->stringToProxy("category/locate:default -p 12010 -t 10000"); + base = communicator->stringToProxy("category/locate:default -p 12010"); obj = TestIntfPrx::checkedCast(base); testExceptions(obj, collocated); cout << "ok" << endl; cout << "testing finished exceptions... " << flush; - base = communicator->stringToProxy("category/finished:default -p 12010 -t 10000"); + base = communicator->stringToProxy("category/finished:default -p 12010"); obj = TestIntfPrx::checkedCast(base); testExceptions(obj, collocated); cout << "ok" << endl; diff --git a/cpp/test/Ice/servantLocator/Collocated.cpp b/cpp/test/Ice/servantLocator/Collocated.cpp index c9b69f04534..af3315d8bfd 100644 --- a/cpp/test/Ice/servantLocator/Collocated.cpp +++ b/cpp/test/Ice/servantLocator/Collocated.cpp @@ -65,7 +65,7 @@ main(int argc, char* argv[]) int TestServer::run(int argc, char* argv[]) { - communicator()->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator()->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter"); adapter->addServantLocator(new ServantLocatorI(""), ""); adapter->addServantLocator(new ServantLocatorI("category"), "category"); diff --git a/cpp/test/Ice/servantLocator/Server.cpp b/cpp/test/Ice/servantLocator/Server.cpp index c86051fb746..8f89c8becaf 100644 --- a/cpp/test/Ice/servantLocator/Server.cpp +++ b/cpp/test/Ice/servantLocator/Server.cpp @@ -64,7 +64,7 @@ main(int argc, char* argv[]) int TestServer::run(int argc, char* argv[]) { - communicator()->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); + communicator()->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); communicator()->getProperties()->setProperty("Ice.Warn.Dispatch", "0"); Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter"); diff --git a/cpp/test/Ice/servantLocator/ServerAMD.cpp b/cpp/test/Ice/servantLocator/ServerAMD.cpp index 10d0d3ee3bf..3806b3644bb 100644 --- a/cpp/test/Ice/servantLocator/ServerAMD.cpp +++ b/cpp/test/Ice/servantLocator/ServerAMD.cpp @@ -64,7 +64,7 @@ main(int argc, char* argv[]) int TestServer::run(int argc, char* argv[]) { - communicator()->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); + communicator()->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); communicator()->getProperties()->setProperty("Ice.Warn.Dispatch", "0"); Ice::ObjectAdapterPtr adapter = communicator()->createObjectAdapter("TestAdapter"); diff --git a/cpp/test/Ice/servantLocator/run.py b/cpp/test/Ice/servantLocator/run.py index 8b6d12458d7..e0779dbf6d2 100755 --- a/cpp/test/Ice/servantLocator/run.py +++ b/cpp/test/Ice/servantLocator/run.py @@ -26,3 +26,5 @@ print "tests with AMD server." TestUtil.clientServerTest(server = "serveramd") print "tests with collocated server." TestUtil.collocatedTest() + +TestUtil.cleanup() diff --git a/cpp/test/Ice/slicing/exceptions/run.py b/cpp/test/Ice/slicing/exceptions/run.py index fe714d9d4d1..eecf185132f 100755 --- a/cpp/test/Ice/slicing/exceptions/run.py +++ b/cpp/test/Ice/slicing/exceptions/run.py @@ -24,3 +24,5 @@ print "tests with regular server." TestUtil.clientServerTest() print "tests with AMD server." TestUtil.clientServerTest(server = "serveramd") + +TestUtil.cleanup() diff --git a/cpp/test/Ice/slicing/objects/run.py b/cpp/test/Ice/slicing/objects/run.py index c50a9b03948..474ffa359c9 100755 --- a/cpp/test/Ice/slicing/objects/run.py +++ b/cpp/test/Ice/slicing/objects/run.py @@ -24,3 +24,5 @@ print "tests with regular server." TestUtil.clientServerTest() print "tests with AMD server." TestUtil.clientServerTest(server = "serveramd") + +TestUtil.cleanup() diff --git a/cpp/test/Ice/stream/run.py b/cpp/test/Ice/stream/run.py index fb3ed194b36..93807972504 100755 --- a/cpp/test/Ice/stream/run.py +++ b/cpp/test/Ice/stream/run.py @@ -22,3 +22,5 @@ from scripts import * client = os.path.join(os.getcwd(), "client") TestUtil.simpleTest(client) + +TestUtil.cleanup() diff --git a/cpp/test/Ice/stringConverter/run.py b/cpp/test/Ice/stringConverter/run.py index c21c5254d3b..066de70501d 100755 --- a/cpp/test/Ice/stringConverter/run.py +++ b/cpp/test/Ice/stringConverter/run.py @@ -23,3 +23,5 @@ from scripts import * client = os.path.join(os.getcwd(), "client") TestUtil.simpleTest(client) + +TestUtil.cleanup() diff --git a/cpp/test/Ice/timeout/AllTests.cpp b/cpp/test/Ice/timeout/AllTests.cpp index 5bfcbd78879..64bae365b0e 100644 --- a/cpp/test/Ice/timeout/AllTests.cpp +++ b/cpp/test/Ice/timeout/AllTests.cpp @@ -125,7 +125,7 @@ typedef IceUtil::Handle<AMISleepEx> AMISleepExPtr; TimeoutPrx allTests(const Ice::CommunicatorPtr& communicator) { - string sref = "timeout:default -p 12010 -t 10000"; + string sref = "timeout:default -p 12010"; Ice::ObjectPrx obj = communicator->stringToProxy(sref); test(obj); diff --git a/cpp/test/Ice/timeout/Server.cpp b/cpp/test/Ice/timeout/Server.cpp index 2595f77a2db..1b6e2ac8e45 100644 --- a/cpp/test/Ice/timeout/Server.cpp +++ b/cpp/test/Ice/timeout/Server.cpp @@ -15,7 +15,7 @@ using namespace std; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { - communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); + communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::ObjectPtr object = new TimeoutI; adapter->add(object, communicator->stringToIdentity("timeout")); diff --git a/cpp/test/Ice/timeout/run.py b/cpp/test/Ice/timeout/run.py index bb34e7d35b7..56d48e628de 100755 --- a/cpp/test/Ice/timeout/run.py +++ b/cpp/test/Ice/timeout/run.py @@ -21,3 +21,5 @@ sys.path.append(os.path.join(path[0])) from scripts import * TestUtil.clientServerTest() + +TestUtil.cleanup() diff --git a/cpp/test/Ice/udp/run.py b/cpp/test/Ice/udp/run.py index c09dbb4359b..e0165ff92a1 100755 --- a/cpp/test/Ice/udp/run.py +++ b/cpp/test/Ice/udp/run.py @@ -39,3 +39,5 @@ clientProc.startReader() clientProc.waitTestSuccess() for p in serverProc: p.waitTestSuccess() + +TestUtil.cleanup() diff --git a/cpp/test/IceBox/configuration/run.py b/cpp/test/IceBox/configuration/run.py index e6ef1e35114..9064dc1b134 100755 --- a/cpp/test/IceBox/configuration/run.py +++ b/cpp/test/IceBox/configuration/run.py @@ -27,3 +27,5 @@ config2 = os.path.join(os.getcwd(), "config.icebox2") TestUtil.clientServerTest(additionalServerOptions= "--Ice.Config=%s" % config, server = icebox) TestUtil.clientServerTest(additionalServerOptions= "--Ice.Config=%s" % config2, server = icebox) + +TestUtil.cleanup() diff --git a/cpp/test/IceGrid/activation/run.py b/cpp/test/IceGrid/activation/run.py index 6ebb0279e94..00134fb51e1 100755 --- a/cpp/test/IceGrid/activation/run.py +++ b/cpp/test/IceGrid/activation/run.py @@ -22,3 +22,5 @@ from scripts import * IceGridAdmin.iceGridTest("application.xml", "", " 'properties-override=%s'" % TestUtil.getCommandLine("", TestUtil.DriverConfig("colloc")).replace("--", "")) + +TestUtil.cleanup() diff --git a/cpp/test/IceGrid/admin/run.py b/cpp/test/IceGrid/admin/run.py index 6be1ba15870..d7ffabb8e3b 100755 --- a/cpp/test/IceGrid/admin/run.py +++ b/cpp/test/IceGrid/admin/run.py @@ -29,8 +29,8 @@ print "starting glacier2...", sys.stdout.flush() router = os.path.join(TestUtil.getCppBinDir(), "glacier2router") args = ' --Glacier2.SessionTimeout=5' + \ - ' --Glacier2.Client.Endpoints="default -p 12347 -t 10000"' + \ - ' --Glacier2.Server.Endpoints="tcp -h 127.0.0.1 -t 10000"' \ + ' --Glacier2.Client.Endpoints="default -p 12347"' + \ + ' --Glacier2.Server.Endpoints="tcp -h 127.0.0.1"' \ ' --Glacier2.SessionManager=IceGrid/AdminSessionManager' + \ ' --Glacier2.PermissionsVerifier=Glacier2/NullPermissionsVerifier' + \ ' --Glacier2.SSLSessionManager=IceGrid/AdminSSLSessionManager' + \ @@ -240,3 +240,5 @@ print "ok" IceGridAdmin.iceGridAdmin("node shutdown localnode") IceGridAdmin.shutdownIceGridRegistry(registryProcs) nodeProc.waitTestSuccess() + +TestUtil.cleanup() diff --git a/cpp/test/IceGrid/allocation/application.xml b/cpp/test/IceGrid/allocation/application.xml index 6564bdb14ae..eeb9a1ae2f9 100644 --- a/cpp/test/IceGrid/allocation/application.xml +++ b/cpp/test/IceGrid/allocation/application.xml @@ -21,7 +21,7 @@ <node name="localnode"> <server-instance template="Glacier2" id="Glacier2" - endpoints="default -p 12347 -t 10000" + endpoints="default -p 12347" verifier="PermissionsVerifier" manager="IceGrid/SessionManager"/> diff --git a/cpp/test/IceGrid/allocation/run.py b/cpp/test/IceGrid/allocation/run.py index 2a010c5a387..9f464fdcd5f 100755 --- a/cpp/test/IceGrid/allocation/run.py +++ b/cpp/test/IceGrid/allocation/run.py @@ -21,3 +21,5 @@ sys.path.append(os.path.join(path[0])) from scripts import * IceGridAdmin.iceGridTest("application.xml") + +TestUtil.cleanup() diff --git a/cpp/test/IceGrid/deployer/run.py b/cpp/test/IceGrid/deployer/run.py index e7e7b33f920..b62a9841b3b 100755 --- a/cpp/test/IceGrid/deployer/run.py +++ b/cpp/test/IceGrid/deployer/run.py @@ -25,3 +25,5 @@ IceGridAdmin.iceGridTest("application.xml", '--TestDir="%s"' % os.getcwd(), '"ic # Tests with targets IceGridAdmin.iceGridTest("application.xml", '-t --TestDir="%s"' % os.getcwd(), "icebox.exe=%s moreservers moreservices moreproperties" % TestUtil.getIceBox()) + +TestUtil.cleanup() diff --git a/cpp/test/IceGrid/distribution/run.py b/cpp/test/IceGrid/distribution/run.py index f5ff701f241..c4a27750436 100755 --- a/cpp/test/IceGrid/distribution/run.py +++ b/cpp/test/IceGrid/distribution/run.py @@ -62,3 +62,5 @@ IceGridAdmin.iceGridTest("application.xml") IceGridAdmin.cleanDbDir(datadir) os.rmdir(datadir) + +TestUtil.cleanup() diff --git a/cpp/test/IceGrid/replicaGroup/run.py b/cpp/test/IceGrid/replicaGroup/run.py index b98075c4392..f642d596cc2 100755 --- a/cpp/test/IceGrid/replicaGroup/run.py +++ b/cpp/test/IceGrid/replicaGroup/run.py @@ -22,3 +22,5 @@ from scripts import * IceGridAdmin.iceGridTest("application.xml", "--Ice.RetryIntervals=\"0 50 100 250\"", "icebox.exe=%s" % TestUtil.getIceBox()) + +TestUtil.cleanup() diff --git a/cpp/test/IceGrid/replication/run.py b/cpp/test/IceGrid/replication/run.py index 6819f25aabf..7742c5c9f21 100755 --- a/cpp/test/IceGrid/replication/run.py +++ b/cpp/test/IceGrid/replication/run.py @@ -24,3 +24,5 @@ TestUtil.addLdPath(os.getcwd()) IceGridAdmin.iceGridTest("application.xml", '--IceDir="%s" --TestDir="%s"' % (TestUtil.toplevel, os.getcwd()), "'properties-override=%s'" % TestUtil.getCommandLine("", TestUtil.DriverConfig("server")).replace("--", "")) + +TestUtil.cleanup() diff --git a/cpp/test/IceGrid/session/application.xml b/cpp/test/IceGrid/session/application.xml index f8238129e36..8189513628c 100644 --- a/cpp/test/IceGrid/session/application.xml +++ b/cpp/test/IceGrid/session/application.xml @@ -24,12 +24,12 @@ <node name="localnode"> <server-instance id="Glacier2" template="Glacier2" - endpoints="default -p 12347 -h 127.0.0.1 -t 10000" + endpoints="default -p 12347 -h 127.0.0.1" verifier="ClientPermissionsVerifier" manager="IceGrid/SessionManager" ssl-manager="IceGrid/SSLSessionManager"/> <server-instance id="Glacier2Admin" template="Glacier2" - endpoints="default -p 12348 -h 127.0.0.1 -t 10000" + endpoints="default -p 12348 -h 127.0.0.1" verifier="AdminPermissionsVerifier:tcp -p 12002" manager="IceGrid/AdminSessionManager" ssl-manager="IceGrid/AdminSSLSessionManager"/> diff --git a/cpp/test/IceGrid/session/run.py b/cpp/test/IceGrid/session/run.py index 4d02eec4fe0..5f9d45d0c40 100755 --- a/cpp/test/IceGrid/session/run.py +++ b/cpp/test/IceGrid/session/run.py @@ -51,3 +51,5 @@ IceGridAdmin.iceGridTest("application.xml", '\\"properties-override=%s\\"' % TestUtil.getCommandLine("", TestUtil.DriverConfig("server")).replace("--", "")) verifierProc.waitTestSuccess() + +TestUtil.cleanup() diff --git a/cpp/test/IceGrid/simple/run.py b/cpp/test/IceGrid/simple/run.py index 4455f5e40e0..ce382bc51f3 100755 --- a/cpp/test/IceGrid/simple/run.py +++ b/cpp/test/IceGrid/simple/run.py @@ -29,3 +29,5 @@ IceGridAdmin.iceGridClientServerTest("", "--TestAdapter.Endpoints=default --Test # Test client/server with on demand activation. # IceGridAdmin.iceGridTest("simple_server.xml", "--with-deploy") + +TestUtil.cleanup() diff --git a/cpp/test/IceGrid/update/run.py b/cpp/test/IceGrid/update/run.py index 74191c1e44e..589e5379762 100755 --- a/cpp/test/IceGrid/update/run.py +++ b/cpp/test/IceGrid/update/run.py @@ -40,3 +40,5 @@ nodeOverrideOptions = '--IceBinDir="%s" --TestDir="%s" --NodePropertiesOverride= TestUtil.getCommandLine("", TestUtil.DriverConfig("server")).replace("--", "")) IceGridAdmin.iceGridTest("", nodeOverrideOptions) + +TestUtil.cleanup() diff --git a/cpp/test/IceSSL/configuration/AllTests.cpp b/cpp/test/IceSSL/configuration/AllTests.cpp index fb5b81345e7..683377c23b6 100644 --- a/cpp/test/IceSSL/configuration/AllTests.cpp +++ b/cpp/test/IceSSL/configuration/AllTests.cpp @@ -147,7 +147,7 @@ createServerProps(const Ice::PropertiesPtr& defaultProperties, const string& def void allTests(const CommunicatorPtr& communicator, const string& testDir) { - string factoryRef = "factory:tcp -p 12010 -t 10000"; + string factoryRef = "factory:tcp -p 12010"; ObjectPrx base = communicator->stringToProxy(factoryRef); test(base); Test::ServerFactoryPrx factory = Test::ServerFactoryPrx::checkedCast(base); diff --git a/cpp/test/IceSSL/configuration/run.py b/cpp/test/IceSSL/configuration/run.py index b88cadf4e51..a2276ef921c 100755 --- a/cpp/test/IceSSL/configuration/run.py +++ b/cpp/test/IceSSL/configuration/run.py @@ -21,3 +21,5 @@ sys.path.append(os.path.join(path[0])) from scripts import * TestUtil.clientServerTest(additionalClientOptions = os.getcwd()) + +TestUtil.cleanup() diff --git a/cpp/test/IceStorm/federation/run.py b/cpp/test/IceStorm/federation/run.py index ea0603c2010..8183283c508 100755 --- a/cpp/test/IceStorm/federation/run.py +++ b/cpp/test/IceStorm/federation/run.py @@ -85,3 +85,5 @@ runtest("persistent") runtest("transient") runtest("replicated", replicatedPublisher = False) runtest("replicated", replicatedPublisher = True) + +TestUtil.cleanup() diff --git a/cpp/test/IceStorm/federation2/run.py b/cpp/test/IceStorm/federation2/run.py index 504bab33c62..340483eb065 100755 --- a/cpp/test/IceStorm/federation2/run.py +++ b/cpp/test/IceStorm/federation2/run.py @@ -263,4 +263,5 @@ runtest("persistent") runtest("replicated", replicatedPublisher = False) runtest("replicated", replicatedPublisher = True) +TestUtil.cleanup() sys.exit(0) diff --git a/cpp/test/IceStorm/rep1/run.py b/cpp/test/IceStorm/rep1/run.py index dd374f172d4..ebf81e27454 100755 --- a/cpp/test/IceStorm/rep1/run.py +++ b/cpp/test/IceStorm/rep1/run.py @@ -281,3 +281,5 @@ print "stopping replicas...", sys.stdout.flush() icestorm.stop() print "ok" + +TestUtil.cleanup() diff --git a/cpp/test/IceStorm/repgrid/run.py b/cpp/test/IceStorm/repgrid/run.py index fa60fbe8021..b811ad6bd29 100755 --- a/cpp/test/IceStorm/repgrid/run.py +++ b/cpp/test/IceStorm/repgrid/run.py @@ -24,3 +24,5 @@ from scripts import * # Test client/server without on demand activation. # IceGridAdmin.iceGridTest("application.xml", "", '"icebox.exe=%s"' % TestUtil.getIceBox()) + +TestUtil.cleanup() diff --git a/cpp/test/IceStorm/repstress/run.py b/cpp/test/IceStorm/repstress/run.py index 46bb3d7ce51..fec7f4c2f40 100755 --- a/cpp/test/IceStorm/repstress/run.py +++ b/cpp/test/IceStorm/repstress/run.py @@ -114,3 +114,5 @@ subscriberProc.waitTestSuccess() print "ok" print "publisher published %s events, subscriber received %s events" % (publisherCount, subscriberCount) + +TestUtil.cleanup() diff --git a/cpp/test/IceStorm/single/run.py b/cpp/test/IceStorm/single/run.py index c3bfc29607b..786dc8ada1a 100755 --- a/cpp/test/IceStorm/single/run.py +++ b/cpp/test/IceStorm/single/run.py @@ -69,4 +69,5 @@ dotest("persistent") dotest("transient") dotest("replicated") +TestUtil.cleanup() sys.exit(0) diff --git a/cpp/test/IceStorm/stress/run.py b/cpp/test/IceStorm/stress/run.py index 723b121944a..161e0c05047 100755 --- a/cpp/test/IceStorm/stress/run.py +++ b/cpp/test/IceStorm/stress/run.py @@ -169,3 +169,5 @@ def runtest(type): runtest("persistent") runtest("replicated") + +TestUtil.cleanup() diff --git a/cpp/test/IceUtil/condvar/run.py b/cpp/test/IceUtil/condvar/run.py index 9252afedd4c..4ffd03456ac 100755 --- a/cpp/test/IceUtil/condvar/run.py +++ b/cpp/test/IceUtil/condvar/run.py @@ -32,3 +32,5 @@ client.waitTestSuccess() client = TestUtil.spawnClient(match + " -b", startReader = True) client.waitTestSuccess() + +TestUtil.cleanup() diff --git a/cpp/test/IceUtil/inputUtil/run.py b/cpp/test/IceUtil/inputUtil/run.py index f1c6206d61a..0800b486b30 100755 --- a/cpp/test/IceUtil/inputUtil/run.py +++ b/cpp/test/IceUtil/inputUtil/run.py @@ -22,3 +22,5 @@ from scripts import * client = os.path.join(os.getcwd(), "client") TestUtil.simpleTest(client, os.getcwd()) + +TestUtil.cleanup() diff --git a/cpp/test/IceUtil/thread/run.py b/cpp/test/IceUtil/thread/run.py index 478bb2b83bc..aa7bdeaf8ee 100755 --- a/cpp/test/IceUtil/thread/run.py +++ b/cpp/test/IceUtil/thread/run.py @@ -23,3 +23,5 @@ from scripts import * client = os.path.join(os.getcwd(), "client") TestUtil.simpleTest(client, os.getcwd()) + +TestUtil.cleanup() diff --git a/cpp/test/IceUtil/timer/run.py b/cpp/test/IceUtil/timer/run.py index fb3ed194b36..93807972504 100755 --- a/cpp/test/IceUtil/timer/run.py +++ b/cpp/test/IceUtil/timer/run.py @@ -22,3 +22,5 @@ from scripts import * client = os.path.join(os.getcwd(), "client") TestUtil.simpleTest(client) + +TestUtil.cleanup() diff --git a/cpp/test/IceUtil/unicode/run.py b/cpp/test/IceUtil/unicode/run.py index 478bb2b83bc..aa7bdeaf8ee 100755 --- a/cpp/test/IceUtil/unicode/run.py +++ b/cpp/test/IceUtil/unicode/run.py @@ -23,3 +23,5 @@ from scripts import * client = os.path.join(os.getcwd(), "client") TestUtil.simpleTest(client, os.getcwd()) + +TestUtil.cleanup() diff --git a/cpp/test/IceUtil/uuid/run.py b/cpp/test/IceUtil/uuid/run.py index fb3ed194b36..93807972504 100755 --- a/cpp/test/IceUtil/uuid/run.py +++ b/cpp/test/IceUtil/uuid/run.py @@ -22,3 +22,5 @@ from scripts import * client = os.path.join(os.getcwd(), "client") TestUtil.simpleTest(client) + +TestUtil.cleanup() diff --git a/cpp/test/Slice/errorDetection/run.py b/cpp/test/Slice/errorDetection/run.py index b10af237310..ed1000b8dc6 100755 --- a/cpp/test/Slice/errorDetection/run.py +++ b/cpp/test/Slice/errorDetection/run.py @@ -57,4 +57,5 @@ for file in files: else: print "ok" +TestUtil.cleanup() sys.exit(0) diff --git a/cpp/test/Slice/keyword/Client.cpp b/cpp/test/Slice/keyword/Client.cpp index 5eaf65563a8..ca49f094467 100644 --- a/cpp/test/Slice/keyword/Client.cpp +++ b/cpp/test/Slice/keyword/Client.cpp @@ -126,7 +126,7 @@ testtypes() int run(const Ice::CommunicatorPtr& communicator) { - communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); + communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); adapter->add(new charI, communicator->stringToIdentity("test")); adapter->activate(); diff --git a/cpp/test/Slice/keyword/run.py b/cpp/test/Slice/keyword/run.py index fb3ed194b36..93807972504 100755 --- a/cpp/test/Slice/keyword/run.py +++ b/cpp/test/Slice/keyword/run.py @@ -22,3 +22,5 @@ from scripts import * client = os.path.join(os.getcwd(), "client") TestUtil.simpleTest(client) + +TestUtil.cleanup() diff --git a/cs/test/Glacier2/router/Client.cs b/cs/test/Glacier2/router/Client.cs index 4e9904b2802..243b9530405 100644 --- a/cs/test/Glacier2/router/Client.cs +++ b/cs/test/Glacier2/router/Client.cs @@ -31,7 +31,7 @@ public class Client { Console.Out.Write("testing stringToProxy for router... "); Console.Out.Flush(); - routerBase = communicator().stringToProxy("Glacier2/router:default -p 12347 -t 30000"); + routerBase = communicator().stringToProxy("Glacier2/router:default -p 12347"); Console.Out.WriteLine("ok"); } @@ -65,7 +65,7 @@ public class Client { Console.Out.Write("testing stringToProxy for server object... "); Console.Out.Flush(); - @base = communicator().stringToProxy("c1/callback:tcp -p 12010 -t 10000"); + @base = communicator().stringToProxy("c1/callback:tcp -p 12010"); Console.Out.WriteLine("ok"); } @@ -386,7 +386,7 @@ public class Client { Console.Out.Write("testing stringToProxy for admin object... "); - processBase = communicator().stringToProxy("Glacier2/admin -f Process:tcp -h 127.0.0.1 -p 12348 -t 10000"); + processBase = communicator().stringToProxy("Glacier2/admin -f Process:tcp -h 127.0.0.1 -p 12348"); Console.Out.WriteLine("ok"); } diff --git a/cs/test/Glacier2/router/Server.cs b/cs/test/Glacier2/router/Server.cs index 0baa3f0dd64..fd3d2c6bfdc 100644 --- a/cs/test/Glacier2/router/Server.cs +++ b/cs/test/Glacier2/router/Server.cs @@ -23,7 +23,7 @@ public class Server { public override int run(string[] args) { - communicator().getProperties().setProperty("CallbackAdapter.Endpoints", "tcp -p 12010 -t 10000"); + communicator().getProperties().setProperty("CallbackAdapter.Endpoints", "tcp -p 12010"); Ice.ObjectAdapter adapter = communicator().createObjectAdapter("CallbackAdapter"); adapter.add(new CallbackI(), communicator().stringToIdentity("c1/callback")); // The test allows "c1" as category. diff --git a/cs/test/Glacier2/router/run.py b/cs/test/Glacier2/router/run.py index de0004085d3..e030392e0a4 100755 --- a/cs/test/Glacier2/router/run.py +++ b/cs/test/Glacier2/router/run.py @@ -27,9 +27,9 @@ args = ' --Ice.Warn.Dispatch=0' + \ ' --Glacier2.Filter.Category.Accept="c1 c2"' + \ ' --Glacier2.Filter.Category.AcceptUser="2"' + \ ' --Glacier2.SessionTimeout="30"' + \ - ' --Glacier2.Client.Endpoints="default -p 12347 -t 10000"' + \ - ' --Glacier2.Server.Endpoints="tcp -h 127.0.0.1 -t 10000"' \ - ' --Ice.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348 -t 10000"' + \ + ' --Glacier2.Client.Endpoints="default -p 12347"' + \ + ' --Glacier2.Server.Endpoints="tcp -h 127.0.0.1"' \ + ' --Ice.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348"' + \ ' --Ice.Admin.InstanceName=Glacier2' + \ ' --Glacier2.CryptPasswords="' + os.path.join(os.getcwd(), "passwords") + '"' @@ -49,3 +49,5 @@ TestUtil.clientServerTest() TestUtil.clientServerTest(additionalClientOptions=" --shutdown") starterProc.waitTestSuccess() + +TestUtil.cleanup() diff --git a/cs/test/Ice/adapterDeactivation/AllTests.cs b/cs/test/Ice/adapterDeactivation/AllTests.cs index 5d671b9721c..4698aaff602 100644 --- a/cs/test/Ice/adapterDeactivation/AllTests.cs +++ b/cs/test/Ice/adapterDeactivation/AllTests.cs @@ -24,7 +24,7 @@ public class AllTests { Console.Out.Write("testing stringToProxy... "); Console.Out.Flush(); - string @ref = "test:default -p 12010 -t 2000"; + string @ref = "test:default -p 12010"; Ice.ObjectPrx @base = communicator.stringToProxy(@ref); test(@base != null); Console.Out.WriteLine("ok"); diff --git a/cs/test/Ice/adapterDeactivation/Collocated.cs b/cs/test/Ice/adapterDeactivation/Collocated.cs index bd00db59c52..f17b00c44e7 100644 --- a/cs/test/Ice/adapterDeactivation/Collocated.cs +++ b/cs/test/Ice/adapterDeactivation/Collocated.cs @@ -24,7 +24,7 @@ public class Collocated { public override int run(string[] args) { - communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter"); Ice.ServantLocator locator = new ServantLocatorI(); adapter.addServantLocator(locator, ""); diff --git a/cs/test/Ice/adapterDeactivation/Server.cs b/cs/test/Ice/adapterDeactivation/Server.cs index a01e85d44d6..8df40af7c2f 100644 --- a/cs/test/Ice/adapterDeactivation/Server.cs +++ b/cs/test/Ice/adapterDeactivation/Server.cs @@ -23,7 +23,7 @@ public class Server { public override int run(string[] args) { - communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000:udp"); + communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter"); Ice.ServantLocator locator = new ServantLocatorI(); adapter.addServantLocator(locator, ""); diff --git a/cs/test/Ice/adapterDeactivation/run.py b/cs/test/Ice/adapterDeactivation/run.py index 41deffb909d..e50097108fa 100755 --- a/cs/test/Ice/adapterDeactivation/run.py +++ b/cs/test/Ice/adapterDeactivation/run.py @@ -22,3 +22,5 @@ from scripts import * TestUtil.clientServerTest() TestUtil.collocatedTest() + +TestUtil.cleanup() diff --git a/cs/test/Ice/background/AllTests.cs b/cs/test/Ice/background/AllTests.cs index 47849311d2c..d48e475bf86 100644 --- a/cs/test/Ice/background/AllTests.cs +++ b/cs/test/Ice/background/AllTests.cs @@ -219,13 +219,13 @@ public class AllTests public static Test.BackgroundPrx allTests(Ice.Communicator communicator) { - string sref = "background:default -p 12010 -t 20000"; + string sref = "background:default -p 12010"; Ice.ObjectPrx obj = communicator.stringToProxy(sref); test(obj != null); BackgroundPrx background = BackgroundPrxHelper.uncheckedCast(obj); - sref = "backgroundController:tcp -p 12011 -t 20000"; + sref = "backgroundController:tcp -p 12011"; obj = communicator.stringToProxy(sref); test(obj != null); @@ -280,7 +280,7 @@ public class AllTests } backgroundController.resumeCall("findAdapterById"); - obj = communicator.stringToProxy("locator:default -p 12010 -t 10000"); + obj = communicator.stringToProxy("locator:default -p 12010"); locator = Ice.LocatorPrxHelper.uncheckedCast(obj); obj = obj.ice_locator(locator); obj.ice_ping(); @@ -321,7 +321,7 @@ public class AllTests } backgroundController.resumeCall("getClientProxy"); - obj = communicator.stringToProxy("router:default -p 12010 -t 10000"); + obj = communicator.stringToProxy("router:default -p 12010"); router = Ice.RouterPrxHelper.uncheckedCast(obj); obj = communicator.stringToProxy("background@Test").ice_router(router); BackgroundPrx bg = BackgroundPrxHelper.uncheckedCast(obj); diff --git a/cs/test/Ice/background/Server.cs b/cs/test/Ice/background/Server.cs index 01a618207d7..dfb6737a929 100644 --- a/cs/test/Ice/background/Server.cs +++ b/cs/test/Ice/background/Server.cs @@ -90,7 +90,7 @@ public class Server // if(communicator.getProperties().getProperty("TestAdapter.Endpoints").Length == 0) { - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010"); } if(communicator.getProperties().getProperty("ControllerAdapter.Endpoints").Length == 0) { diff --git a/cs/test/Ice/background/run.py b/cs/test/Ice/background/run.py index b1c2e15a493..8b4f9543191 100755 --- a/cs/test/Ice/background/run.py +++ b/cs/test/Ice/background/run.py @@ -21,3 +21,5 @@ sys.path.append(os.path.join(path[0])) from scripts import * TestUtil.clientServerTest() + +TestUtil.cleanup() diff --git a/cs/test/Ice/binding/AllTests.cs b/cs/test/Ice/binding/AllTests.cs index f38e3ccbd5b..12d230b6ddc 100644 --- a/cs/test/Ice/binding/AllTests.cs +++ b/cs/test/Ice/binding/AllTests.cs @@ -120,7 +120,7 @@ public class AllTests public static void allTests(Ice.Communicator communicator) { - string @ref = "communicator:default -p 12010 -t 10000"; + string @ref = "communicator:default -p 12010"; RemoteCommunicatorPrx com = RemoteCommunicatorPrxHelper.uncheckedCast(communicator.stringToProxy(@ref)); System.Random rand = new System.Random(unchecked((int)System.DateTime.Now.Ticks)); diff --git a/cs/test/Ice/binding/Server.cs b/cs/test/Ice/binding/Server.cs index b1b1fb8821f..64c8a97ef3b 100644 --- a/cs/test/Ice/binding/Server.cs +++ b/cs/test/Ice/binding/Server.cs @@ -21,7 +21,7 @@ public class Server { private static int run(string[] args, Ice.Communicator communicator) { - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000:udp"); + communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Identity id = communicator.stringToIdentity("communicator"); adapter.add(new RemoteCommunicatorI(), id); diff --git a/cs/test/Ice/binding/run.py b/cs/test/Ice/binding/run.py index b1c2e15a493..8b4f9543191 100755 --- a/cs/test/Ice/binding/run.py +++ b/cs/test/Ice/binding/run.py @@ -21,3 +21,5 @@ sys.path.append(os.path.join(path[0])) from scripts import * TestUtil.clientServerTest() + +TestUtil.cleanup() diff --git a/cs/test/Ice/checksum/AllTests.cs b/cs/test/Ice/checksum/AllTests.cs index 3b90901e9a1..91106980a7f 100644 --- a/cs/test/Ice/checksum/AllTests.cs +++ b/cs/test/Ice/checksum/AllTests.cs @@ -24,7 +24,7 @@ public class AllTests public static Test.ChecksumPrx allTests(Ice.Communicator communicator, bool collocated) { - string rf = "test:default -p 12010 -t 10000"; + string rf = "test:default -p 12010"; Ice.ObjectPrx baseProxy = communicator.stringToProxy(rf); test(baseProxy != null); diff --git a/cs/test/Ice/checksum/run.py b/cs/test/Ice/checksum/run.py index 023492a48e4..862049349d9 100755 --- a/cs/test/Ice/checksum/run.py +++ b/cs/test/Ice/checksum/run.py @@ -21,3 +21,5 @@ sys.path.append(os.path.join(path[0])) from scripts import * TestUtil.clientServerTest(server = os.path.join(os.getcwd(), "server", "server")) + +TestUtil.cleanup() diff --git a/cs/test/Ice/defaultServant/run.py b/cs/test/Ice/defaultServant/run.py index c37cd7dd820..ab9e282f950 100755 --- a/cs/test/Ice/defaultServant/run.py +++ b/cs/test/Ice/defaultServant/run.py @@ -28,3 +28,5 @@ print "ok" clientProc.startReader() clientProc.waitTestSuccess() + +TestUtil.cleanup() diff --git a/cs/test/Ice/dictMapping/AllTests.cs b/cs/test/Ice/dictMapping/AllTests.cs index 4a69d79863f..fc58e18725e 100644 --- a/cs/test/Ice/dictMapping/AllTests.cs +++ b/cs/test/Ice/dictMapping/AllTests.cs @@ -14,7 +14,7 @@ public class AllTests public static Test.MyClassPrx allTests(Ice.Communicator communicator, bool collocated) { Console.Out.Flush(); - string rf = "test:default -p 12010 -t 10000"; + string rf = "test:default -p 12010"; Ice.ObjectPrx baseProxy = communicator.stringToProxy(rf); Test.MyClassPrx cl = Test.MyClassPrxHelper.checkedCast(baseProxy); diff --git a/cs/test/Ice/dictMapping/Collocated.cs b/cs/test/Ice/dictMapping/Collocated.cs index ebf36318108..0dca40d473b 100644 --- a/cs/test/Ice/dictMapping/Collocated.cs +++ b/cs/test/Ice/dictMapping/Collocated.cs @@ -21,7 +21,7 @@ public class Collocated { private static int run(String[] args, Ice.Communicator communicator) { - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); adapter.add(new MyClassI(), communicator.stringToIdentity("test")); adapter.activate(); diff --git a/cs/test/Ice/dictMapping/run.py b/cs/test/Ice/dictMapping/run.py index 41d0413642d..4e847a9908f 100755 --- a/cs/test/Ice/dictMapping/run.py +++ b/cs/test/Ice/dictMapping/run.py @@ -26,3 +26,5 @@ print "tests with AMD server." TestUtil.clientServerTest(server="serveramd") print "tests with collocated server." TestUtil.collocatedTest() + +TestUtil.cleanup() diff --git a/cs/test/Ice/exceptions/AllTests.cs b/cs/test/Ice/exceptions/AllTests.cs index dbb1c6b224f..c53ed61104a 100644 --- a/cs/test/Ice/exceptions/AllTests.cs +++ b/cs/test/Ice/exceptions/AllTests.cs @@ -691,7 +691,7 @@ public class AllTests try { Ice.ObjectAdapter second = - communicator.createObjectAdapterWithEndpoints("TestAdapter0", "ssl -h foo -p 12011 -t 10000"); + communicator.createObjectAdapterWithEndpoints("TestAdapter0", "ssl -h foo -p 12011"); test(false); // @@ -772,7 +772,7 @@ public class AllTests Console.Write("testing stringToProxy... "); Console.Out.Flush(); - String @ref = "thrower:default -p 12010 -t 2000"; + String @ref = "thrower:default -p 12010"; Ice.ObjectPrx @base = communicator.stringToProxy(@ref); test(@base != null); Console.WriteLine("ok"); diff --git a/cs/test/Ice/exceptions/Collocated.cs b/cs/test/Ice/exceptions/Collocated.cs index bcfb5ea4eee..ef9cf623e57 100644 --- a/cs/test/Ice/exceptions/Collocated.cs +++ b/cs/test/Ice/exceptions/Collocated.cs @@ -22,7 +22,7 @@ public class Collocated private static int run(string[] args, Ice.Communicator communicator) { - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000"); + communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object obj = new ThrowerI(adapter); adapter.add(obj, communicator.stringToIdentity("thrower")); diff --git a/cs/test/Ice/exceptions/Server.cs b/cs/test/Ice/exceptions/Server.cs index 11b95ba79ec..0474524231a 100644 --- a/cs/test/Ice/exceptions/Server.cs +++ b/cs/test/Ice/exceptions/Server.cs @@ -43,7 +43,7 @@ public class Server Ice.Properties properties = communicator.getProperties(); // We don't need to disable warnings because we have a dummy logger. //properties.setProperty("Ice.Warn.Dispatch", "0"); - properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000:udp"); + properties.setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object @object = new ThrowerI(adapter); adapter.add(@object, communicator.stringToIdentity("thrower")); diff --git a/cs/test/Ice/exceptions/run.py b/cs/test/Ice/exceptions/run.py index 0321e0dd6b8..3b550e943f8 100755 --- a/cs/test/Ice/exceptions/run.py +++ b/cs/test/Ice/exceptions/run.py @@ -26,3 +26,5 @@ print "tests with AMD server." TestUtil.clientServerTest(server="serveramd") print "tests with collocated server." TestUtil.collocatedTest() + +TestUtil.cleanup() diff --git a/cs/test/Ice/facets/AllTests.cs b/cs/test/Ice/facets/AllTests.cs index a5375201011..1b0e64d0a7e 100644 --- a/cs/test/Ice/facets/AllTests.cs +++ b/cs/test/Ice/facets/AllTests.cs @@ -103,7 +103,7 @@ public class AllTests Console.Write("testing stringToProxy... "); Console.Out.Flush(); - string @ref = "d:default -p 12010 -t 2000"; + string @ref = "d:default -p 12010"; Ice.ObjectPrx db = communicator.stringToProxy(@ref); test(db != null); Console.WriteLine("ok"); diff --git a/cs/test/Ice/facets/Collocated.cs b/cs/test/Ice/facets/Collocated.cs index fbd92e75881..033e91a68ea 100644 --- a/cs/test/Ice/facets/Collocated.cs +++ b/cs/test/Ice/facets/Collocated.cs @@ -21,7 +21,7 @@ public class Collocated { private static int run(string[] args, Ice.Communicator communicator) { - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000"); + communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object d = new DI(); adapter.add(d, communicator.stringToIdentity("d")); diff --git a/cs/test/Ice/facets/Server.cs b/cs/test/Ice/facets/Server.cs index 931f15b28d3..ba38a198019 100644 --- a/cs/test/Ice/facets/Server.cs +++ b/cs/test/Ice/facets/Server.cs @@ -21,7 +21,7 @@ public class Server { private static int run(string[] args, Ice.Communicator communicator) { - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000"); + communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object d = new DI(); adapter.add(d, communicator.stringToIdentity("d")); diff --git a/cs/test/Ice/facets/run.py b/cs/test/Ice/facets/run.py index 41deffb909d..e50097108fa 100755 --- a/cs/test/Ice/facets/run.py +++ b/cs/test/Ice/facets/run.py @@ -22,3 +22,5 @@ from scripts import * TestUtil.clientServerTest() TestUtil.collocatedTest() + +TestUtil.cleanup() diff --git a/cs/test/Ice/faultTolerance/AllTests.cs b/cs/test/Ice/faultTolerance/AllTests.cs index 7b316ed5dfb..7f9efceb77e 100644 --- a/cs/test/Ice/faultTolerance/AllTests.cs +++ b/cs/test/Ice/faultTolerance/AllTests.cs @@ -173,7 +173,7 @@ public class AllTests string refString = "test"; for(int i = 0; i < ports.Count; i++) { - refString += ":default -t 60000 -p " + ports[i]; + refString += ":default -p " + ports[i]; } Ice.ObjectPrx basePrx = communicator.stringToProxy(refString); test(basePrx != null); diff --git a/cs/test/Ice/faultTolerance/run.py b/cs/test/Ice/faultTolerance/run.py index b5fcefccbd8..956154f5006 100755 --- a/cs/test/Ice/faultTolerance/run.py +++ b/cs/test/Ice/faultTolerance/run.py @@ -51,3 +51,5 @@ for p in serverProc: # We simuluate the abort of the server by calling Process.Kill(). However, this # results in a non-zero exit status. Therefore we ignore the status. p.wait() + +TestUtil.cleanup() diff --git a/cs/test/Ice/hold/AllTests.cs b/cs/test/Ice/hold/AllTests.cs index a53912ba911..e45db4e5d53 100644 --- a/cs/test/Ice/hold/AllTests.cs +++ b/cs/test/Ice/hold/AllTests.cs @@ -102,10 +102,10 @@ public class AllTests { Console.Out.Write("testing stringToProxy... "); Console.Out.Flush(); - String @ref = "hold:default -p 12010 -t 30000"; + String @ref = "hold:default -p 12010"; Ice.ObjectPrx @base = communicator.stringToProxy(@ref); test(@base != null); - String refSerialized = "hold:default -p 12011 -t 30000"; + String refSerialized = "hold:default -p 12011"; Ice.ObjectPrx baseSerialized = communicator.stringToProxy(refSerialized); test(baseSerialized != null); Console.Out.WriteLine("ok"); diff --git a/cs/test/Ice/hold/Server.cs b/cs/test/Ice/hold/Server.cs index 45f12ae68fb..8f7033630f4 100644 --- a/cs/test/Ice/hold/Server.cs +++ b/cs/test/Ice/hold/Server.cs @@ -21,7 +21,7 @@ public class Server { private static int run(string[] args, Ice.Communicator communicator) { - communicator.getProperties().setProperty("TestAdapter1.Endpoints", "default -p 12010 -t 10000:udp"); + communicator.getProperties().setProperty("TestAdapter1.Endpoints", "default -p 12010:udp"); communicator.getProperties().setProperty("TestAdapter1.ThreadPool.Size", "5"); communicator.getProperties().setProperty("TestAdapter1.ThreadPool.SizeMax", "5"); communicator.getProperties().setProperty("TestAdapter1.ThreadPool.SizeWarn", "0"); @@ -29,7 +29,7 @@ public class Server Ice.ObjectAdapter adapter1 = communicator.createObjectAdapter("TestAdapter1"); adapter1.add(new HoldI(adapter1), communicator.stringToIdentity("hold")); - communicator.getProperties().setProperty("TestAdapter2.Endpoints", "default -p 12011 -t 10000:udp"); + communicator.getProperties().setProperty("TestAdapter2.Endpoints", "default -p 12011:udp"); communicator.getProperties().setProperty("TestAdapter2.ThreadPool.Size", "5"); communicator.getProperties().setProperty("TestAdapter2.ThreadPool.SizeMax", "5"); communicator.getProperties().setProperty("TestAdapter2.ThreadPool.SizeWarn", "0"); diff --git a/cs/test/Ice/hold/run.py b/cs/test/Ice/hold/run.py index b1c2e15a493..8b4f9543191 100755 --- a/cs/test/Ice/hold/run.py +++ b/cs/test/Ice/hold/run.py @@ -21,3 +21,5 @@ sys.path.append(os.path.join(path[0])) from scripts import * TestUtil.clientServerTest() + +TestUtil.cleanup() diff --git a/cs/test/Ice/inheritance/AllTests.cs b/cs/test/Ice/inheritance/AllTests.cs index 969c16aca89..a9dae962472 100644 --- a/cs/test/Ice/inheritance/AllTests.cs +++ b/cs/test/Ice/inheritance/AllTests.cs @@ -24,7 +24,7 @@ public class AllTests { Console.Out.Write("testing stringToProxy... "); Console.Out.Flush(); - string ref_Renamed = "initial:default -p 12010 -t 2000"; + string ref_Renamed = "initial:default -p 12010"; Ice.ObjectPrx @base = communicator.stringToProxy(ref_Renamed); test(@base != null); Console.Out.WriteLine("ok"); diff --git a/cs/test/Ice/inheritance/Collocated.cs b/cs/test/Ice/inheritance/Collocated.cs index c03d54e509d..98396288fee 100644 --- a/cs/test/Ice/inheritance/Collocated.cs +++ b/cs/test/Ice/inheritance/Collocated.cs @@ -22,7 +22,7 @@ public class Collocated private static int run(string[] args, Ice.Communicator communicator) { - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000"); + communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object obj = new InitialI(adapter); adapter.add(obj, communicator.stringToIdentity("initial")); diff --git a/cs/test/Ice/inheritance/Server.cs b/cs/test/Ice/inheritance/Server.cs index eeb4bbf7fc9..a0ab033ac7c 100644 --- a/cs/test/Ice/inheritance/Server.cs +++ b/cs/test/Ice/inheritance/Server.cs @@ -21,7 +21,7 @@ public class Server { private static int run(string[] args, Ice.Communicator communicator) { - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000"); + communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object @object = new InitialI(adapter); adapter.add(@object, communicator.stringToIdentity("initial")); diff --git a/cs/test/Ice/inheritance/run.py b/cs/test/Ice/inheritance/run.py index 41deffb909d..e50097108fa 100755 --- a/cs/test/Ice/inheritance/run.py +++ b/cs/test/Ice/inheritance/run.py @@ -22,3 +22,5 @@ from scripts import * TestUtil.clientServerTest() TestUtil.collocatedTest() + +TestUtil.cleanup() diff --git a/cs/test/Ice/interceptor/run.py b/cs/test/Ice/interceptor/run.py index c37cd7dd820..ab9e282f950 100755 --- a/cs/test/Ice/interceptor/run.py +++ b/cs/test/Ice/interceptor/run.py @@ -28,3 +28,5 @@ print "ok" clientProc.startReader() clientProc.waitTestSuccess() + +TestUtil.cleanup() diff --git a/cs/test/Ice/location/AllTests.cs b/cs/test/Ice/location/AllTests.cs index b91af5e17d4..a883e216d4e 100644 --- a/cs/test/Ice/location/AllTests.cs +++ b/cs/test/Ice/location/AllTests.cs @@ -52,7 +52,7 @@ public class AllTests public static void allTests(Ice.Communicator communicator) { ServerManagerPrx manager = ServerManagerPrxHelper.checkedCast( - communicator.stringToProxy("ServerManager :default -t 10000 -p 12010")); + communicator.stringToProxy("ServerManager :default -p 12010")); test(manager != null); TestLocatorPrx locator = TestLocatorPrxHelper.uncheckedCast(communicator.getDefaultLocator()); test(locator != null); diff --git a/cs/test/Ice/location/Server.cs b/cs/test/Ice/location/Server.cs index 860df24fc19..20d729492dd 100644 --- a/cs/test/Ice/location/Server.cs +++ b/cs/test/Ice/location/Server.cs @@ -29,7 +29,7 @@ public class Server // Ice.Properties properties = communicator.getProperties(); properties.setProperty("Ice.ThreadPool.Server.Size", "2"); - properties.setProperty("ServerManagerAdapter.Endpoints", "default -p 12010 -t 30000:udp"); + properties.setProperty("ServerManagerAdapter.Endpoints", "default -p 12010:udp"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("ServerManagerAdapter"); diff --git a/cs/test/Ice/location/ServerManagerI.cs b/cs/test/Ice/location/ServerManagerI.cs index 908ddfa6a48..2202f6bc299 100644 --- a/cs/test/Ice/location/ServerManagerI.cs +++ b/cs/test/Ice/location/ServerManagerI.cs @@ -54,7 +54,7 @@ public class ServerManagerI : ServerManagerDisp_ Ice.ObjectAdapter adapter = serverCommunicator.createObjectAdapter("TestAdapter"); Ice.ObjectAdapter adapter2 = serverCommunicator.createObjectAdapter("TestAdapter2"); - Ice.ObjectPrx locator = serverCommunicator.stringToProxy("locator:default -p 12010 -t 30000"); + Ice.ObjectPrx locator = serverCommunicator.stringToProxy("locator:default -p 12010"); adapter.setLocator(Ice.LocatorPrxHelper.uncheckedCast(locator)); adapter2.setLocator(Ice.LocatorPrxHelper.uncheckedCast(locator)); diff --git a/cs/test/Ice/location/run.py b/cs/test/Ice/location/run.py index b1c2e15a493..8b4f9543191 100755 --- a/cs/test/Ice/location/run.py +++ b/cs/test/Ice/location/run.py @@ -21,3 +21,5 @@ sys.path.append(os.path.join(path[0])) from scripts import * TestUtil.clientServerTest() + +TestUtil.cleanup() diff --git a/cs/test/Ice/objects/AllTests.cs b/cs/test/Ice/objects/AllTests.cs index aa0dff3e8bd..3c7a5e99083 100644 --- a/cs/test/Ice/objects/AllTests.cs +++ b/cs/test/Ice/objects/AllTests.cs @@ -24,7 +24,7 @@ public class AllTests { Console.Out.Write("testing stringToProxy... "); Console.Out.Flush(); - String @ref = "initial:default -p 12010 -t 2000"; + String @ref = "initial:default -p 12010"; Ice.ObjectPrx @base = communicator.stringToProxy(@ref); test(@base != null); Console.Out.WriteLine("ok"); @@ -166,7 +166,7 @@ public class AllTests { Console.Out.Write("testing UnexpectedObjectException..."); Console.Out.Flush(); - @ref = "uoet:default -p 12010 -t 10000"; + @ref = "uoet:default -p 12010"; @base = communicator.stringToProxy(@ref); test(@base != null); UnexpectedObjectExceptionTestPrx uoet = UnexpectedObjectExceptionTestPrxHelper.uncheckedCast(@base); diff --git a/cs/test/Ice/objects/Collocated.cs b/cs/test/Ice/objects/Collocated.cs index bf80b09341f..acaf18c412e 100644 --- a/cs/test/Ice/objects/Collocated.cs +++ b/cs/test/Ice/objects/Collocated.cs @@ -23,7 +23,7 @@ public class Client private static int run(string[] args, Ice.Communicator communicator) { - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000"); + communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Initial initial = new InitialI(adapter); adapter.add(initial, communicator.stringToIdentity("initial")); diff --git a/cs/test/Ice/objects/Server.cs b/cs/test/Ice/objects/Server.cs index 27c5eda8dda..90b51ed021d 100644 --- a/cs/test/Ice/objects/Server.cs +++ b/cs/test/Ice/objects/Server.cs @@ -53,7 +53,7 @@ public class Server communicator.addObjectFactory(factory, "::Test::J"); communicator.addObjectFactory(factory, "::Test::H"); - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000"); + communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object @object = new InitialI(adapter); adapter.add(@object, communicator.stringToIdentity("initial")); diff --git a/cs/test/Ice/objects/run.py b/cs/test/Ice/objects/run.py index 41deffb909d..e50097108fa 100755 --- a/cs/test/Ice/objects/run.py +++ b/cs/test/Ice/objects/run.py @@ -22,3 +22,5 @@ from scripts import * TestUtil.clientServerTest() TestUtil.collocatedTest() + +TestUtil.cleanup() diff --git a/cs/test/Ice/operations/AllTests.cs b/cs/test/Ice/operations/AllTests.cs index 23b28abec42..5ccd86602ff 100644 --- a/cs/test/Ice/operations/AllTests.cs +++ b/cs/test/Ice/operations/AllTests.cs @@ -14,7 +14,7 @@ public class AllTests public static Test.MyClassPrx allTests(Ice.Communicator communicator, bool collocated) { Console.Out.Flush(); - string rf = "test:default -p 12010 -t 10000"; + string rf = "test:default -p 12010"; Ice.ObjectPrx baseProxy = communicator.stringToProxy(rf); Test.MyClassPrx cl = Test.MyClassPrxHelper.checkedCast(baseProxy); Test.MyDerivedClassPrx derivedProxy = Test.MyDerivedClassPrxHelper.checkedCast(cl); diff --git a/cs/test/Ice/operations/Collocated.cs b/cs/test/Ice/operations/Collocated.cs index fc2aedc4960..a5b0f38927b 100644 --- a/cs/test/Ice/operations/Collocated.cs +++ b/cs/test/Ice/operations/Collocated.cs @@ -21,7 +21,7 @@ public class Collocated { private static int run(String[] args, Ice.Communicator communicator) { - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); adapter.add(new MyDerivedClassI(), communicator.stringToIdentity("test")); adapter.activate(); diff --git a/cs/test/Ice/operations/Server.cs b/cs/test/Ice/operations/Server.cs index 43d3f164a4c..ab425c24a27 100644 --- a/cs/test/Ice/operations/Server.cs +++ b/cs/test/Ice/operations/Server.cs @@ -26,7 +26,7 @@ public class Server // communicator.getProperties().setProperty("Ice.Warn.Connections", "0"); - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); + communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); adapter.add(new MyDerivedClassI(), communicator.stringToIdentity("test")); adapter.activate(); diff --git a/cs/test/Ice/operations/Twoways.cs b/cs/test/Ice/operations/Twoways.cs index 5bbcffe0f7c..8ea2ce65486 100644 --- a/cs/test/Ice/operations/Twoways.cs +++ b/cs/test/Ice/operations/Twoways.cs @@ -675,7 +675,7 @@ class Twoways communicator.setDefaultContext(dflt); Test.MyClassPrx c = Test.MyClassPrxHelper.checkedCast( - communicator.stringToProxy("test:default -p 12010 -t 10000")); + communicator.stringToProxy("test:default -p 12010")); test(c.opContext().Equals(dflt)); dflt["a"] = "c"; @@ -719,7 +719,7 @@ class Twoways ctx["three"] = "THREE"; Test.MyClassPrx p3 = Test.MyClassPrxHelper.uncheckedCast( - ic.stringToProxy("test:default -p 12010 -t 10000")); + ic.stringToProxy("test:default -p 12010")); ic.getImplicitContext().setContext(ctx); test(Ice.CollectionComparer.Equals(ic.getImplicitContext().getContext(), ctx)); diff --git a/cs/test/Ice/operations/TwowaysAMI.cs b/cs/test/Ice/operations/TwowaysAMI.cs index b8c34da34f4..232ea35a39a 100644 --- a/cs/test/Ice/operations/TwowaysAMI.cs +++ b/cs/test/Ice/operations/TwowaysAMI.cs @@ -1409,7 +1409,7 @@ public class TwowaysAMI communicator.setDefaultContext(dflt); Test.MyClassPrx c = Test.MyClassPrxHelper.checkedCast( - communicator.stringToProxy("test:default -p 12010 -t 10000")); + communicator.stringToProxy("test:default -p 12010")); { Ice.Context tmp = new Ice.Context(); tmp["a"] = "b"; @@ -1483,7 +1483,7 @@ public class TwowaysAMI ctx["three"] = "THREE"; Test.MyClassPrx p3 = Test.MyClassPrxHelper.uncheckedCast( - ic.stringToProxy("test:default -p 12010 -t 10000")); + ic.stringToProxy("test:default -p 12010")); ic.getImplicitContext().setContext(ctx); test(Ice.CollectionComparer.Equals(ic.getImplicitContext().getContext(), ctx)); diff --git a/cs/test/Ice/operations/run.py b/cs/test/Ice/operations/run.py index 41d0413642d..4e847a9908f 100755 --- a/cs/test/Ice/operations/run.py +++ b/cs/test/Ice/operations/run.py @@ -26,3 +26,5 @@ print "tests with AMD server." TestUtil.clientServerTest(server="serveramd") print "tests with collocated server." TestUtil.collocatedTest() + +TestUtil.cleanup() diff --git a/cs/test/Ice/proxy/AllTests.cs b/cs/test/Ice/proxy/AllTests.cs index f06154c37fc..261f70feed2 100644 --- a/cs/test/Ice/proxy/AllTests.cs +++ b/cs/test/Ice/proxy/AllTests.cs @@ -25,7 +25,7 @@ public class AllTests { Console.Out.Write("testing stringToProxy... "); Console.Out.Flush(); - string rf = "test:default -p 12010 -t 10000"; + string rf = "test:default -p 12010"; Ice.ObjectPrx baseProxy = communicator.stringToProxy(rf); test(baseProxy != null); @@ -229,7 +229,7 @@ public class AllTests Console.Out.Flush(); Ice.Properties prop = communicator.getProperties(); String propertyPrefix = "Foo.Proxy"; - prop.setProperty(propertyPrefix, "test:default -p 12010 -t 10000"); + prop.setProperty(propertyPrefix, "test:default -p 12010"); b1 = communicator.propertyToProxy(propertyPrefix); test(b1.ice_getIdentity().name.Equals("test") && b1.ice_getIdentity().category.Length == 0 && b1.ice_getAdapterId().Length == 0 && b1.ice_getFacet().Length == 0); @@ -273,7 +273,7 @@ public class AllTests //test(b1.ice_getLocatorCacheTimeout() == 60); //prop.setProperty("Ice.Default.LocatorCacheTimeout", ""); - prop.setProperty(propertyPrefix, "test:default -p 12010 -t 10000"); + prop.setProperty(propertyPrefix, "test:default -p 12010"); property = propertyPrefix + ".Router"; test(b1.ice_getRouter() == null); diff --git a/cs/test/Ice/proxy/Collocated.cs b/cs/test/Ice/proxy/Collocated.cs index e9731837748..d9a0892ac90 100644 --- a/cs/test/Ice/proxy/Collocated.cs +++ b/cs/test/Ice/proxy/Collocated.cs @@ -21,7 +21,7 @@ public class Collocated { private static int run(String[] args, Ice.Communicator communicator) { - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 5000"); + communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); adapter.add(new MyDerivedClassI(), communicator.stringToIdentity("test")); adapter.activate(); diff --git a/cs/test/Ice/proxy/Server.cs b/cs/test/Ice/proxy/Server.cs index a049a08903c..5457d83aa61 100644 --- a/cs/test/Ice/proxy/Server.cs +++ b/cs/test/Ice/proxy/Server.cs @@ -26,7 +26,7 @@ public class Server // communicator.getProperties().setProperty("Ice.Warn.Connections", "0"); - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 5000:udp"); + communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); adapter.add(new MyDerivedClassI(), communicator.stringToIdentity("test")); adapter.activate(); diff --git a/cs/test/Ice/proxy/run.py b/cs/test/Ice/proxy/run.py index 41d0413642d..4e847a9908f 100755 --- a/cs/test/Ice/proxy/run.py +++ b/cs/test/Ice/proxy/run.py @@ -26,3 +26,5 @@ print "tests with AMD server." TestUtil.clientServerTest(server="serveramd") print "tests with collocated server." TestUtil.collocatedTest() + +TestUtil.cleanup() diff --git a/cs/test/Ice/retry/AllTests.cs b/cs/test/Ice/retry/AllTests.cs index 7fffe8d51c9..11157217afc 100644 --- a/cs/test/Ice/retry/AllTests.cs +++ b/cs/test/Ice/retry/AllTests.cs @@ -105,7 +105,7 @@ public class AllTests { Console.Out.Write("testing stringToProxy... "); Console.Out.Flush(); - string rf = "retry:default -p 12010 -t 10000"; + string rf = "retry:default -p 12010"; Ice.ObjectPrx base1 = communicator.stringToProxy(rf); test(base1 != null); Ice.ObjectPrx base2 = communicator.stringToProxy(rf); diff --git a/cs/test/Ice/retry/Server.cs b/cs/test/Ice/retry/Server.cs index dc282c8ee99..b9cedc899b4 100644 --- a/cs/test/Ice/retry/Server.cs +++ b/cs/test/Ice/retry/Server.cs @@ -21,7 +21,7 @@ public class Server { public static int run(string[] args, Ice.Communicator communicator) { - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); adapter.add(new RetryI(), communicator.stringToIdentity("retry")); adapter.activate(); diff --git a/cs/test/Ice/retry/run.py b/cs/test/Ice/retry/run.py index b1c2e15a493..8b4f9543191 100755 --- a/cs/test/Ice/retry/run.py +++ b/cs/test/Ice/retry/run.py @@ -21,3 +21,5 @@ sys.path.append(os.path.join(path[0])) from scripts import * TestUtil.clientServerTest() + +TestUtil.cleanup() diff --git a/cs/test/Ice/seqMapping/AllTests.cs b/cs/test/Ice/seqMapping/AllTests.cs index 4a69d79863f..fc58e18725e 100644 --- a/cs/test/Ice/seqMapping/AllTests.cs +++ b/cs/test/Ice/seqMapping/AllTests.cs @@ -14,7 +14,7 @@ public class AllTests public static Test.MyClassPrx allTests(Ice.Communicator communicator, bool collocated) { Console.Out.Flush(); - string rf = "test:default -p 12010 -t 10000"; + string rf = "test:default -p 12010"; Ice.ObjectPrx baseProxy = communicator.stringToProxy(rf); Test.MyClassPrx cl = Test.MyClassPrxHelper.checkedCast(baseProxy); diff --git a/cs/test/Ice/seqMapping/Collocated.cs b/cs/test/Ice/seqMapping/Collocated.cs index ebf36318108..0dca40d473b 100644 --- a/cs/test/Ice/seqMapping/Collocated.cs +++ b/cs/test/Ice/seqMapping/Collocated.cs @@ -21,7 +21,7 @@ public class Collocated { private static int run(String[] args, Ice.Communicator communicator) { - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); adapter.add(new MyClassI(), communicator.stringToIdentity("test")); adapter.activate(); diff --git a/cs/test/Ice/seqMapping/run.py b/cs/test/Ice/seqMapping/run.py index 41d0413642d..4e847a9908f 100755 --- a/cs/test/Ice/seqMapping/run.py +++ b/cs/test/Ice/seqMapping/run.py @@ -26,3 +26,5 @@ print "tests with AMD server." TestUtil.clientServerTest(server="serveramd") print "tests with collocated server." TestUtil.collocatedTest() + +TestUtil.cleanup() diff --git a/cs/test/Ice/servantLocator/AllTests.cs b/cs/test/Ice/servantLocator/AllTests.cs index b4c247f4d89..937d441f5ad 100644 --- a/cs/test/Ice/servantLocator/AllTests.cs +++ b/cs/test/Ice/servantLocator/AllTests.cs @@ -189,7 +189,7 @@ public class AllTests { Console.Out.Write("testing stringToProxy... "); Console.Out.Flush(); - string @ref = "asm:default -p 12010 -t 2000"; + string @ref = "asm:default -p 12010"; Ice.ObjectPrx @base = communicator.stringToProxy(@ref); test(@base != null); Console.Out.WriteLine("ok"); @@ -205,7 +205,7 @@ public class AllTests Console.Out.Flush(); try { - Ice.ObjectPrx o = communicator.stringToProxy("category/locate:default -p 12010 -t 10000"); + Ice.ObjectPrx o = communicator.stringToProxy("category/locate:default -p 12010"); o.ice_ids(); test(false); } @@ -220,7 +220,7 @@ public class AllTests try { - Ice.ObjectPrx o = communicator.stringToProxy("category/finished:default -p 12010 -t 10000"); + Ice.ObjectPrx o = communicator.stringToProxy("category/finished:default -p 12010"); o.ice_ids(); test(false); } @@ -236,11 +236,11 @@ public class AllTests Console.Out.Write("testing servant locator..."); Console.Out.Flush(); - @base = communicator.stringToProxy("category/locate:default -p 12010 -t 10000"); + @base = communicator.stringToProxy("category/locate:default -p 12010"); obj = TestIntfPrxHelper.checkedCast(@base); try { - TestIntfPrxHelper.checkedCast(communicator.stringToProxy("category/unknown:default -p 12010 -t 10000")); + TestIntfPrxHelper.checkedCast(communicator.stringToProxy("category/unknown:default -p 12010")); } catch(ObjectNotExistException) { @@ -249,20 +249,20 @@ public class AllTests Console.Out.Write("testing default servant locator..."); Console.Out.Flush(); - @base = communicator.stringToProxy("anothercat/locate:default -p 12010 -t 10000"); + @base = communicator.stringToProxy("anothercat/locate:default -p 12010"); obj = TestIntfPrxHelper.checkedCast(@base); - @base = communicator.stringToProxy("locate:default -p 12010 -t 10000"); + @base = communicator.stringToProxy("locate:default -p 12010"); obj = TestIntfPrxHelper.checkedCast(@base); try { - TestIntfPrxHelper.checkedCast(communicator.stringToProxy("anothercat/unknown:default -p 12010 -t 10000")); + TestIntfPrxHelper.checkedCast(communicator.stringToProxy("anothercat/unknown:default -p 12010")); } catch(ObjectNotExistException) { } try { - TestIntfPrxHelper.checkedCast(communicator.stringToProxy("unknown:default -p 12010 -t 10000")); + TestIntfPrxHelper.checkedCast(communicator.stringToProxy("unknown:default -p 12010")); } catch(ObjectNotExistException) { @@ -271,14 +271,14 @@ public class AllTests Console.Out.Write("testing locate exceptions... "); Console.Out.Flush(); - @base = communicator.stringToProxy("category/locate:default -p 12010 -t 10000"); + @base = communicator.stringToProxy("category/locate:default -p 12010"); obj = TestIntfPrxHelper.checkedCast(@base); testExceptions(obj, collocated); Console.Out.WriteLine("ok"); Console.Out.Write("testing finished exceptions... "); Console.Out.Flush(); - @base = communicator.stringToProxy("category/finished:default -p 12010 -t 10000"); + @base = communicator.stringToProxy("category/finished:default -p 12010"); obj = TestIntfPrxHelper.checkedCast(@base); testExceptions(obj, collocated); Console.Out.WriteLine("ok"); diff --git a/cs/test/Ice/servantLocator/Collocated.cs b/cs/test/Ice/servantLocator/Collocated.cs index ac9337c56a2..1a3001a1394 100644 --- a/cs/test/Ice/servantLocator/Collocated.cs +++ b/cs/test/Ice/servantLocator/Collocated.cs @@ -24,7 +24,7 @@ public class Collocated { public override int run(string[] args) { - communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010"); communicator().getProperties().setProperty("Ice.Warn.Dispatch", "0"); Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter"); diff --git a/cs/test/Ice/servantLocator/Server.cs b/cs/test/Ice/servantLocator/Server.cs index 843fee9007b..f1d4cda3d89 100644 --- a/cs/test/Ice/servantLocator/Server.cs +++ b/cs/test/Ice/servantLocator/Server.cs @@ -23,7 +23,7 @@ public class Server { public override int run(string[] args) { - communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 2000"); + communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010"); communicator().getProperties().setProperty("Ice.Warn.Dispatch", "0"); Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter"); diff --git a/cs/test/Ice/servantLocator/run.py b/cs/test/Ice/servantLocator/run.py index d45d92dfae7..2d7a7ba39ab 100755 --- a/cs/test/Ice/servantLocator/run.py +++ b/cs/test/Ice/servantLocator/run.py @@ -26,3 +26,5 @@ print "tests with AMD server." TestUtil.clientServerTest(server="serveramd") print "tests with collocated server." TestUtil.collocatedTest() + +TestUtil.cleanup() diff --git a/cs/test/Ice/slicing/exceptions/run.py b/cs/test/Ice/slicing/exceptions/run.py index 30f66d5b116..ffbb2fb7eb3 100755 --- a/cs/test/Ice/slicing/exceptions/run.py +++ b/cs/test/Ice/slicing/exceptions/run.py @@ -24,3 +24,5 @@ print "tests with regular server." TestUtil.clientServerTest() print "tests with AMD server." TestUtil.clientServerTest(server="serveramd") + +TestUtil.cleanup() diff --git a/cs/test/Ice/slicing/objects/run.py b/cs/test/Ice/slicing/objects/run.py index 30f66d5b116..ffbb2fb7eb3 100755 --- a/cs/test/Ice/slicing/objects/run.py +++ b/cs/test/Ice/slicing/objects/run.py @@ -24,3 +24,5 @@ print "tests with regular server." TestUtil.clientServerTest() print "tests with AMD server." TestUtil.clientServerTest(server="serveramd") + +TestUtil.cleanup() diff --git a/cs/test/Ice/stream/run.py b/cs/test/Ice/stream/run.py index 095f48ba6dc..234e4795172 100755 --- a/cs/test/Ice/stream/run.py +++ b/cs/test/Ice/stream/run.py @@ -27,3 +27,5 @@ clientProc = TestUtil.startClient(client, " --Ice.Warn.Dispatch=0 2>&1", startRe print "ok" clientProc.startReader() clientProc.waitTestSuccess() + +TestUtil.cleanup() diff --git a/cs/test/Ice/timeout/AllTests.cs b/cs/test/Ice/timeout/AllTests.cs index f33f986be27..f7eb81e4393 100644 --- a/cs/test/Ice/timeout/AllTests.cs +++ b/cs/test/Ice/timeout/AllTests.cs @@ -144,7 +144,7 @@ public class AllTests public static Test.TimeoutPrx allTests(Ice.Communicator communicator) { - string sref = "timeout:default -p 12010 -t 10000"; + string sref = "timeout:default -p 12010"; Ice.ObjectPrx obj = communicator.stringToProxy(sref); test(obj != null); diff --git a/cs/test/Ice/timeout/Server.cs b/cs/test/Ice/timeout/Server.cs index 4a290241cda..bd91650e44b 100644 --- a/cs/test/Ice/timeout/Server.cs +++ b/cs/test/Ice/timeout/Server.cs @@ -21,7 +21,7 @@ public class Server { public static int run(string[] args, Ice.Communicator communicator) { - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); adapter.add(new TimeoutI(), communicator.stringToIdentity("timeout")); adapter.activate(); diff --git a/cs/test/Ice/timeout/run.py b/cs/test/Ice/timeout/run.py index b1c2e15a493..8b4f9543191 100755 --- a/cs/test/Ice/timeout/run.py +++ b/cs/test/Ice/timeout/run.py @@ -21,3 +21,5 @@ sys.path.append(os.path.join(path[0])) from scripts import * TestUtil.clientServerTest() + +TestUtil.cleanup() diff --git a/cs/test/Ice/udp/run.py b/cs/test/Ice/udp/run.py index c09dbb4359b..e0165ff92a1 100755 --- a/cs/test/Ice/udp/run.py +++ b/cs/test/Ice/udp/run.py @@ -39,3 +39,5 @@ clientProc.startReader() clientProc.waitTestSuccess() for p in serverProc: p.waitTestSuccess() + +TestUtil.cleanup() diff --git a/cs/test/IceBox/configuration/run.py b/cs/test/IceBox/configuration/run.py index 9eb64996764..57c3c531b36 100755 --- a/cs/test/IceBox/configuration/run.py +++ b/cs/test/IceBox/configuration/run.py @@ -26,3 +26,5 @@ TestUtil.clientServerTest(additionalServerOptions="--Ice.Config=%s" % os.path.jo server=icebox) TestUtil.clientServerTest(additionalServerOptions="--Ice.Config=%s" % os.path.join(os.getcwd(), "config.icebox2"), server=icebox) + +TestUtil.cleanup() diff --git a/cs/test/IceGrid/simple/run.py b/cs/test/IceGrid/simple/run.py index 1a8675e0185..4d7287f1a46 100755 --- a/cs/test/IceGrid/simple/run.py +++ b/cs/test/IceGrid/simple/run.py @@ -32,3 +32,5 @@ if TestUtil.mono: IceGridAdmin.iceGridTest("simple_mono_server.xml", "--with-deploy") else: IceGridAdmin.iceGridTest("simple_server.xml", "--with-deploy") + +TestUtil.cleanup() diff --git a/cs/test/IceSSL/configuration/AllTests.cs b/cs/test/IceSSL/configuration/AllTests.cs index 1aeaf86fdc3..57ac76ed823 100644 --- a/cs/test/IceSSL/configuration/AllTests.cs +++ b/cs/test/IceSSL/configuration/AllTests.cs @@ -71,7 +71,7 @@ public class AllTests public static Test.ServerFactoryPrx allTests(Ice.Communicator communicator, string testDir) { - string factoryRef = "factory:tcp -p 12010 -t 10000"; + string factoryRef = "factory:tcp -p 12010"; Ice.ObjectPrx b = communicator.stringToProxy(factoryRef); test(b != null); Test.ServerFactoryPrx factory = Test.ServerFactoryPrxHelper.checkedCast(b); diff --git a/cs/test/IceSSL/configuration/run.py b/cs/test/IceSSL/configuration/run.py index ff60c099d95..9a80bf1b00d 100755 --- a/cs/test/IceSSL/configuration/run.py +++ b/cs/test/IceSSL/configuration/run.py @@ -25,3 +25,5 @@ from scripts import * # plug-in will not work. # TestUtil.clientServerTest(additionalClientOptions=os.path.splitdrive(os.getcwd())[1]) + +TestUtil.cleanup() diff --git a/cs/test/IceUtil/inputUtil/run.py b/cs/test/IceUtil/inputUtil/run.py index 416dbd2b2cb..bd260a003b4 100755 --- a/cs/test/IceUtil/inputUtil/run.py +++ b/cs/test/IceUtil/inputUtil/run.py @@ -27,3 +27,5 @@ clientProc = TestUtil.startClient(client, "", startReader = False) print "ok" clientProc.startReader() clientProc.waitTestSuccess() + +TestUtil.cleanup() diff --git a/cs/test/Slice/keyword/Client.cs b/cs/test/Slice/keyword/Client.cs index 31de7a10f46..3f948ca62ff 100644 --- a/cs/test/Slice/keyword/Client.cs +++ b/cs/test/Slice/keyword/Client.cs @@ -134,7 +134,7 @@ public class Server private static int run(string[] args, Ice.Communicator communicator) { - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); + communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); adapter.add(new decimalI(), communicator.stringToIdentity("test")); adapter.activate(); diff --git a/cs/test/Slice/keyword/run.py b/cs/test/Slice/keyword/run.py index cff0642c936..e5ebe2b6bd6 100755 --- a/cs/test/Slice/keyword/run.py +++ b/cs/test/Slice/keyword/run.py @@ -27,3 +27,5 @@ clientProc = TestUtil.startClient(client, startReader = False) print "ok" clientProc.startReader() clientProc.waitTestSuccess() + +TestUtil.cleanup() diff --git a/java/test/Freeze/complex/run.py b/java/test/Freeze/complex/run.py index 233b4b4221a..b86f1514114 100755 --- a/java/test/Freeze/complex/run.py +++ b/java/test/Freeze/complex/run.py @@ -40,3 +40,5 @@ clientProc = TestUtil.startClient("test.Freeze.complex.Client", " --dbdir %s val print "ok" clientProc.startReader() clientProc.waitTestSuccess() + +TestUtil.cleanup() diff --git a/java/test/Freeze/dbmap/run.py b/java/test/Freeze/dbmap/run.py index 1ffda5b95b4..c7c6e9be96e 100755 --- a/java/test/Freeze/dbmap/run.py +++ b/java/test/Freeze/dbmap/run.py @@ -28,3 +28,5 @@ clientProc = TestUtil.startClient("test.Freeze.dbmap.Client", os.getcwd(), start print "ok" clientProc.startReader() clientProc.waitTestSuccess() + +TestUtil.cleanup() diff --git a/java/test/Freeze/evictor/Client.java b/java/test/Freeze/evictor/Client.java index ab8a7989bad..84af28ce6c4 100644 --- a/java/test/Freeze/evictor/Client.java +++ b/java/test/Freeze/evictor/Client.java @@ -426,7 +426,7 @@ public class Client extends test.Util.Application throws AlreadyRegisteredException, NotRegisteredException, EvictorDeactivatedException { Ice.Communicator communicator = communicator(); - String ref = "factory:default -p 12010 -t 30000"; + String ref = "factory:default -p 12010"; Ice.ObjectPrx base = communicator.stringToProxy(ref); test(base != null); RemoteEvictorFactoryPrx factory = RemoteEvictorFactoryPrxHelper.checkedCast(base); diff --git a/java/test/Freeze/evictor/RemoteEvictorI.java b/java/test/Freeze/evictor/RemoteEvictorI.java index ed20ea03a99..d1c5b28f60d 100644 --- a/java/test/Freeze/evictor/RemoteEvictorI.java +++ b/java/test/Freeze/evictor/RemoteEvictorI.java @@ -62,11 +62,13 @@ public final class RemoteEvictorI extends _RemoteEvictorDisp if(transactional) { - _evictor = Freeze.Util.createTransactionalEvictor(_evictorAdapter, envName, category, null, initializer, null, true); + _evictor = Freeze.Util.createTransactionalEvictor(_evictorAdapter, envName, category, null, initializer, + null, true); } else { - _evictor = Freeze.Util.createBackgroundSaveEvictor(_evictorAdapter, envName, category, initializer, null, true); + _evictor = Freeze.Util.createBackgroundSaveEvictor(_evictorAdapter, envName, category, initializer, null, + true); } initializer.init(this, _evictor); diff --git a/java/test/Freeze/evictor/run.py b/java/test/Freeze/evictor/run.py index eb2ec82742a..4a3462a612e 100755 --- a/java/test/Freeze/evictor/run.py +++ b/java/test/Freeze/evictor/run.py @@ -26,3 +26,5 @@ TestUtil.cleanDbDir(dbdir) testOptions = " --Freeze.Warn.Deadlocks=0 --Freeze.DbEnv.db.DbHome=%s/db --Ice.Config=%s/config " % (os.getcwd(), os.getcwd()) TestUtil.clientServerTest(testOptions, testOptions) + +TestUtil.cleanup() diff --git a/java/test/Freeze/oldevictor/Client.java b/java/test/Freeze/oldevictor/Client.java index ee5f42de0c4..f30b38e2e29 100644 --- a/java/test/Freeze/oldevictor/Client.java +++ b/java/test/Freeze/oldevictor/Client.java @@ -340,7 +340,7 @@ public class Client extends test.Util.Application run(String[] args, PrintWriter out) throws AlreadyRegisteredException, NotRegisteredException, EvictorDeactivatedException { - String ref = "factory:default -p 12010 -t 30000"; + String ref = "factory:default -p 12010"; Ice.ObjectPrx base = communicator().stringToProxy(ref); test(base != null); RemoteEvictorFactoryPrx factory = RemoteEvictorFactoryPrxHelper.checkedCast(base); diff --git a/java/test/Freeze/oldevictor/run.py b/java/test/Freeze/oldevictor/run.py index b17366f6069..e5a3fbac28f 100755 --- a/java/test/Freeze/oldevictor/run.py +++ b/java/test/Freeze/oldevictor/run.py @@ -26,3 +26,5 @@ TestUtil.cleanDbDir(dbdir) testOptions = " --Freeze.DbEnv.db.DbHome=%s --Ice.Config=%s" % (dbdir, os.path.join(os.getcwd(), "config")) TestUtil.clientServerTest(testOptions, testOptions) + +TestUtil.cleanup() diff --git a/java/test/Glacier2/router/Client.java b/java/test/Glacier2/router/Client.java index 19d0322968f..72ac5f6cf11 100644 --- a/java/test/Glacier2/router/Client.java +++ b/java/test/Glacier2/router/Client.java @@ -38,7 +38,7 @@ public class Client extends test.Util.Application { out.print("testing stringToProxy for router... "); out.flush(); - routerBase = communicator().stringToProxy("Glacier2/router:default -p 12347 -t 30000"); + routerBase = communicator().stringToProxy("Glacier2/router:default -p 12347"); out.println("ok"); } @@ -72,7 +72,7 @@ public class Client extends test.Util.Application { out.print("testing stringToProxy for server object... "); out.flush(); - base = communicator().stringToProxy("c1/callback:tcp -p 12010 -t 10000"); + base = communicator().stringToProxy("c1/callback:tcp -p 12010"); out.println("ok"); } @@ -421,7 +421,7 @@ public class Client extends test.Util.Application { out.print("testing stringToProxy for process object... "); - processBase = communicator().stringToProxy("Glacier2/admin -f Process:tcp -h 127.0.0.1 -p 12348 -t 10000"); + processBase = communicator().stringToProxy("Glacier2/admin -f Process:tcp -h 127.0.0.1 -p 12348"); out.println("ok"); } diff --git a/java/test/Glacier2/router/Server.java b/java/test/Glacier2/router/Server.java index 21b2dd8b50e..cd266883ab9 100644 --- a/java/test/Glacier2/router/Server.java +++ b/java/test/Glacier2/router/Server.java @@ -14,7 +14,7 @@ public class Server extends test.Util.Application public int run(String[] args) { - communicator().getProperties().setProperty("CallbackAdapter.Endpoints", "tcp -p 12010 -t 10000"); + communicator().getProperties().setProperty("CallbackAdapter.Endpoints", "tcp -p 12010"); Ice.ObjectAdapter adapter = communicator().createObjectAdapter("CallbackAdapter"); adapter.add(new CallbackI(), communicator().stringToIdentity("c1/callback")); // The test allows "c1" as category. diff --git a/java/test/Glacier2/router/run.py b/java/test/Glacier2/router/run.py index 976a222bee1..9ac4099c255 100755 --- a/java/test/Glacier2/router/run.py +++ b/java/test/Glacier2/router/run.py @@ -27,9 +27,9 @@ args = ' --Ice.Warn.Dispatch=0' + \ ' --Glacier2.Filter.Category.Accept="c1 c2"' + \ ' --Glacier2.Filter.Category.AcceptUser="2"' + \ ' --Glacier2.SessionTimeout="30"' + \ - ' --Glacier2.Client.Endpoints="default -p 12347 -t 10000"' + \ - ' --Glacier2.Server.Endpoints="tcp -h 127.0.0.1 -t 10000"' \ - ' --Ice.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348 -t 10000"' + \ + ' --Glacier2.Client.Endpoints="default -p 12347"' + \ + ' --Glacier2.Server.Endpoints="tcp -h 127.0.0.10"' \ + ' --Ice.Admin.Endpoints="tcp -h 127.0.0.1 -p 12348"' + \ ' --Ice.Admin.InstanceName=Glacier2' + \ ' --Glacier2.CryptPasswords="' + os.path.join(os.getcwd(), "passwords") + '"' @@ -44,3 +44,5 @@ TestUtil.clientServerTest() TestUtil.clientServerTest(additionalClientOptions=" --shutdown") starterProc.waitTestSuccess() + +TestUtil.cleanup() diff --git a/java/test/Ice/adapterDeactivation/AllTests.java b/java/test/Ice/adapterDeactivation/AllTests.java index ca5bc9160d4..a8af4287e52 100644 --- a/java/test/Ice/adapterDeactivation/AllTests.java +++ b/java/test/Ice/adapterDeactivation/AllTests.java @@ -30,7 +30,7 @@ public class AllTests { out.print("testing stringToProxy... "); out.flush(); - String ref = "test:default -p 12010 -t 10000"; + String ref = "test:default -p 12010"; Ice.ObjectPrx base = communicator.stringToProxy(ref); test(base != null); out.println("ok"); diff --git a/java/test/Ice/adapterDeactivation/Collocated.java b/java/test/Ice/adapterDeactivation/Collocated.java index 60e7399f0ef..c054e57c122 100644 --- a/java/test/Ice/adapterDeactivation/Collocated.java +++ b/java/test/Ice/adapterDeactivation/Collocated.java @@ -29,7 +29,7 @@ public class Collocated extends test.Util.Application Ice.InitializationData initData = new Ice.InitializationData(); initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.adapterDeactivation"); - initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010"); return initData; } diff --git a/java/test/Ice/adapterDeactivation/Server.java b/java/test/Ice/adapterDeactivation/Server.java index 36ed2b732bf..826aa0de912 100644 --- a/java/test/Ice/adapterDeactivation/Server.java +++ b/java/test/Ice/adapterDeactivation/Server.java @@ -29,7 +29,7 @@ public class Server extends test.Util.Application Ice.InitializationData initData = new Ice.InitializationData(); initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.adapterDeactivation"); - initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); + initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); return initData; } diff --git a/java/test/Ice/adapterDeactivation/run.py b/java/test/Ice/adapterDeactivation/run.py index 545214a74c7..979b91c2544 100755 --- a/java/test/Ice/adapterDeactivation/run.py +++ b/java/test/Ice/adapterDeactivation/run.py @@ -22,3 +22,5 @@ from scripts import * TestUtil.clientServerTest() TestUtil.collocatedTest() + +TestUtil.cleanup() diff --git a/java/test/Ice/background/AllTests.java b/java/test/Ice/background/AllTests.java index 3bead0cfa51..1f5b38e9d01 100644 --- a/java/test/Ice/background/AllTests.java +++ b/java/test/Ice/background/AllTests.java @@ -238,13 +238,13 @@ public class AllTests public static BackgroundPrx allTests(Configuration configuration, Ice.Communicator communicator, PrintWriter out) { - String sref = "background:default -p 12010 -t 20000"; + String sref = "background:default -p 12010"; Ice.ObjectPrx obj = communicator.stringToProxy(sref); test(obj != null); BackgroundPrx background = BackgroundPrxHelper.uncheckedCast(obj); - sref = "backgroundController:tcp -p 12011 -t 20000"; + sref = "backgroundController:tcp -p 12011"; obj = communicator.stringToProxy(sref); test(obj != null); @@ -296,7 +296,7 @@ public class AllTests } backgroundController.resumeCall("findAdapterById"); - obj = communicator.stringToProxy("locator:default -p 12010 -t 20000"); + obj = communicator.stringToProxy("locator:default -p 12010"); locator = Ice.LocatorPrxHelper.uncheckedCast(obj); obj = obj.ice_locator(locator); obj.ice_ping(); @@ -336,7 +336,7 @@ public class AllTests } backgroundController.resumeCall("getClientProxy"); - obj = communicator.stringToProxy("router:default -p 12010 -t 20000"); + obj = communicator.stringToProxy("router:default -p 12010"); router = Ice.RouterPrxHelper.uncheckedCast(obj); obj = communicator.stringToProxy("background@Test").ice_router(router); BackgroundPrx bg = BackgroundPrxHelper.uncheckedCast(obj); diff --git a/java/test/Ice/background/Server.java b/java/test/Ice/background/Server.java index 7d3e941a3f1..1ecf7c3c025 100644 --- a/java/test/Ice/background/Server.java +++ b/java/test/Ice/background/Server.java @@ -126,7 +126,7 @@ public class Server extends test.Util.Application initData.properties.setProperty("Ice.Package.Test", "test.Ice.background"); - initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 20000"); + initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010"); initData.properties.setProperty("ControllerAdapter.Endpoints", "tcp -p 12011"); initData.properties.setProperty("ControllerAdapter.ThreadPool.Size", "1"); diff --git a/java/test/Ice/background/run.py b/java/test/Ice/background/run.py index bb34e7d35b7..56d48e628de 100755 --- a/java/test/Ice/background/run.py +++ b/java/test/Ice/background/run.py @@ -21,3 +21,5 @@ sys.path.append(os.path.join(path[0])) from scripts import * TestUtil.clientServerTest() + +TestUtil.cleanup() diff --git a/java/test/Ice/binding/AllTests.java b/java/test/Ice/binding/AllTests.java index 9e3c824c030..f15ce6a186b 100644 --- a/java/test/Ice/binding/AllTests.java +++ b/java/test/Ice/binding/AllTests.java @@ -124,7 +124,7 @@ public class AllTests public static void allTests(Ice.Communicator communicator, PrintWriter out) { - String ref = "communicator:default -p 12010 -t 10000"; + String ref = "communicator:default -p 12010"; RemoteCommunicatorPrx com = RemoteCommunicatorPrxHelper.uncheckedCast(communicator.stringToProxy(ref)); out.print("testing binding with single endpoint... "); diff --git a/java/test/Ice/binding/run.py b/java/test/Ice/binding/run.py index bb34e7d35b7..56d48e628de 100755 --- a/java/test/Ice/binding/run.py +++ b/java/test/Ice/binding/run.py @@ -21,3 +21,5 @@ sys.path.append(os.path.join(path[0])) from scripts import * TestUtil.clientServerTest() + +TestUtil.cleanup() diff --git a/java/test/Ice/checksum/AllTests.java b/java/test/Ice/checksum/AllTests.java index b8910e8e445..f3cbed56857 100644 --- a/java/test/Ice/checksum/AllTests.java +++ b/java/test/Ice/checksum/AllTests.java @@ -26,7 +26,7 @@ public class AllTests public static ChecksumPrx allTests(Ice.Communicator communicator, boolean collocated, PrintWriter out) { - String ref = "test:default -p 12010 -t 10000"; + String ref = "test:default -p 12010"; Ice.ObjectPrx base = communicator.stringToProxy(ref); test(base != null); diff --git a/java/test/Ice/checksum/Server.java b/java/test/Ice/checksum/Server.java index a28b5b0a2dd..426165083cb 100644 --- a/java/test/Ice/checksum/Server.java +++ b/java/test/Ice/checksum/Server.java @@ -15,7 +15,7 @@ public class Server extends test.Util.Application run(String[] args) { Ice.Communicator communicator = communicator(); - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object object = new ChecksumI(adapter); adapter.add(object, communicator.stringToIdentity("test")); diff --git a/java/test/Ice/checksum/run.py b/java/test/Ice/checksum/run.py index bb34e7d35b7..56d48e628de 100755 --- a/java/test/Ice/checksum/run.py +++ b/java/test/Ice/checksum/run.py @@ -21,3 +21,5 @@ sys.path.append(os.path.join(path[0])) from scripts import * TestUtil.clientServerTest() + +TestUtil.cleanup() diff --git a/java/test/Ice/custom14/AllTests.java b/java/test/Ice/custom14/AllTests.java index ae85324ca00..4cef78a0e01 100644 --- a/java/test/Ice/custom14/AllTests.java +++ b/java/test/Ice/custom14/AllTests.java @@ -53,7 +53,7 @@ public class AllTests { out.print("testing stringToProxy... "); out.flush(); - String ref = "test:default -p 12010 -t 10000"; + String ref = "test:default -p 12010"; Ice.ObjectPrx obj = communicator.stringToProxy(ref); test(obj != null); out.println("ok"); diff --git a/java/test/Ice/custom14/Collocated.java b/java/test/Ice/custom14/Collocated.java index 18e72e1b84d..0e9b997f96a 100644 --- a/java/test/Ice/custom14/Collocated.java +++ b/java/test/Ice/custom14/Collocated.java @@ -28,7 +28,7 @@ public class Collocated extends test.Util.Application Ice.InitializationData initData = new Ice.InitializationData(); initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.custom14"); - initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010"); return initData; } diff --git a/java/test/Ice/custom14/Server.java b/java/test/Ice/custom14/Server.java index 180e9fd2f68..f78e8cbfb87 100644 --- a/java/test/Ice/custom14/Server.java +++ b/java/test/Ice/custom14/Server.java @@ -28,7 +28,7 @@ public class Server extends test.Util.Application Ice.InitializationData initData = new Ice.InitializationData(); initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.custom14"); - initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010"); return initData; } diff --git a/java/test/Ice/custom14/run.py b/java/test/Ice/custom14/run.py index 545214a74c7..979b91c2544 100755 --- a/java/test/Ice/custom14/run.py +++ b/java/test/Ice/custom14/run.py @@ -22,3 +22,5 @@ from scripts import * TestUtil.clientServerTest() TestUtil.collocatedTest() + +TestUtil.cleanup() diff --git a/java/test/Ice/custom15/AllTests.java b/java/test/Ice/custom15/AllTests.java index 94aee414bcb..8a8a4d44170 100644 --- a/java/test/Ice/custom15/AllTests.java +++ b/java/test/Ice/custom15/AllTests.java @@ -54,7 +54,7 @@ public class AllTests { out.print("testing stringToProxy... "); out.flush(); - String ref = "test:default -p 12010 -t 10000"; + String ref = "test:default -p 12010"; Ice.ObjectPrx obj = communicator.stringToProxy(ref); test(obj != null); out.println("ok"); diff --git a/java/test/Ice/custom15/Collocated.java b/java/test/Ice/custom15/Collocated.java index 94c9480d328..68c3a88a346 100644 --- a/java/test/Ice/custom15/Collocated.java +++ b/java/test/Ice/custom15/Collocated.java @@ -28,7 +28,7 @@ public class Collocated extends test.Util.Application Ice.InitializationData initData = new Ice.InitializationData(); initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.custom15"); - initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010"); return initData; } diff --git a/java/test/Ice/custom15/Server.java b/java/test/Ice/custom15/Server.java index bc972cd07a1..f76edac1261 100644 --- a/java/test/Ice/custom15/Server.java +++ b/java/test/Ice/custom15/Server.java @@ -28,7 +28,7 @@ public class Server extends test.Util.Application Ice.InitializationData initData = new Ice.InitializationData(); initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.custom15"); - initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010"); return initData; } diff --git a/java/test/Ice/custom15/run.py b/java/test/Ice/custom15/run.py index 545214a74c7..979b91c2544 100755 --- a/java/test/Ice/custom15/run.py +++ b/java/test/Ice/custom15/run.py @@ -22,3 +22,5 @@ from scripts import * TestUtil.clientServerTest() TestUtil.collocatedTest() + +TestUtil.cleanup() diff --git a/java/test/Ice/defaultServant/run.py b/java/test/Ice/defaultServant/run.py index 5053bafec30..a4cb650386d 100755 --- a/java/test/Ice/defaultServant/run.py +++ b/java/test/Ice/defaultServant/run.py @@ -26,3 +26,5 @@ print "ok" clientProc.startReader() clientProc.waitTestSuccess() + +TestUtil.cleanup() diff --git a/java/test/Ice/exceptions/AMDServer.java b/java/test/Ice/exceptions/AMDServer.java index a6f3f30e7a1..b5338f26dd2 100644 --- a/java/test/Ice/exceptions/AMDServer.java +++ b/java/test/Ice/exceptions/AMDServer.java @@ -32,7 +32,7 @@ public class AMDServer extends test.Util.Application initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.exceptions.AMD"); - initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); + initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); // We don't need to disable warnings, because we have a dummy logger. // properties.setProperty("Ice.Warn.Dispatch", "0"); diff --git a/java/test/Ice/exceptions/AllTests.java b/java/test/Ice/exceptions/AllTests.java index cc8d7e1a104..e5370a42f85 100644 --- a/java/test/Ice/exceptions/AllTests.java +++ b/java/test/Ice/exceptions/AllTests.java @@ -769,7 +769,7 @@ public class AllTests try { Ice.ObjectAdapter second = - communicator.createObjectAdapterWithEndpoints("TestAdapter0", "ssl -h foo -p 12011 -t 10000"); + communicator.createObjectAdapterWithEndpoints("TestAdapter0", "ssl -h foo -p 12011"); test(false); } catch(Ice.AlreadyRegisteredException ex) @@ -845,7 +845,7 @@ public class AllTests out.print("testing stringToProxy... "); out.flush(); - String ref = "thrower:default -p 12010 -t 10000"; + String ref = "thrower:default -p 12010"; Ice.ObjectPrx base = communicator.stringToProxy(ref); test(base != null); out.println("ok"); diff --git a/java/test/Ice/exceptions/Collocated.java b/java/test/Ice/exceptions/Collocated.java index 52222997412..cbcf32ded12 100644 --- a/java/test/Ice/exceptions/Collocated.java +++ b/java/test/Ice/exceptions/Collocated.java @@ -29,7 +29,7 @@ public class Collocated extends test.Util.Application Ice.InitializationData initData = new Ice.InitializationData(); initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.exceptions"); - initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010"); return initData; } diff --git a/java/test/Ice/exceptions/Server.java b/java/test/Ice/exceptions/Server.java index ffbb1d690db..e56792ec055 100644 --- a/java/test/Ice/exceptions/Server.java +++ b/java/test/Ice/exceptions/Server.java @@ -28,7 +28,7 @@ public class Server extends test.Util.Application initData.logger = new DummyLogger(); initData.properties.setProperty("Ice.Package.Test", "test.Ice.exceptions"); - initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); + initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); // We don't need to disable warnings, because we have a dummy logger. // properties.setProperty("Ice.Warn.Dispatch", "0"); diff --git a/java/test/Ice/exceptions/run.py b/java/test/Ice/exceptions/run.py index 8266b166ff9..749cf593b0e 100755 --- a/java/test/Ice/exceptions/run.py +++ b/java/test/Ice/exceptions/run.py @@ -28,3 +28,5 @@ TestUtil.clientServerTest(server="test.Ice.exceptions.AMDServer") print "tests with collocated server." TestUtil.collocatedTest() + +TestUtil.cleanup() diff --git a/java/test/Ice/facets/AllTests.java b/java/test/Ice/facets/AllTests.java index 21fa77be371..252a60f16dd 100644 --- a/java/test/Ice/facets/AllTests.java +++ b/java/test/Ice/facets/AllTests.java @@ -113,7 +113,7 @@ public class AllTests out.print("testing stringToProxy... "); out.flush(); - String ref = "d:default -p 12010 -t 10000"; + String ref = "d:default -p 12010"; Ice.ObjectPrx db = communicator.stringToProxy(ref); test(db != null); out.println("ok"); diff --git a/java/test/Ice/facets/Collocated.java b/java/test/Ice/facets/Collocated.java index 302ef2b32a6..7564adc2324 100644 --- a/java/test/Ice/facets/Collocated.java +++ b/java/test/Ice/facets/Collocated.java @@ -14,7 +14,7 @@ public class Collocated extends test.Util.Application public int run(String[] args) { Ice.Communicator communicator = communicator(); - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Ice.Object d = new DI(); adapter.add(d, communicator.stringToIdentity("d")); diff --git a/java/test/Ice/facets/Server.java b/java/test/Ice/facets/Server.java index cf16c8fad62..be24d4961f6 100644 --- a/java/test/Ice/facets/Server.java +++ b/java/test/Ice/facets/Server.java @@ -33,7 +33,7 @@ public class Server extends test.Util.Application Ice.InitializationData initData = new Ice.InitializationData(); initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.facets"); - initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010"); return initData; } diff --git a/java/test/Ice/facets/run.py b/java/test/Ice/facets/run.py index 545214a74c7..979b91c2544 100755 --- a/java/test/Ice/facets/run.py +++ b/java/test/Ice/facets/run.py @@ -22,3 +22,5 @@ from scripts import * TestUtil.clientServerTest() TestUtil.collocatedTest() + +TestUtil.cleanup() diff --git a/java/test/Ice/faultTolerance/AllTests.java b/java/test/Ice/faultTolerance/AllTests.java index 65df0a594f8..e9b3837bae4 100644 --- a/java/test/Ice/faultTolerance/AllTests.java +++ b/java/test/Ice/faultTolerance/AllTests.java @@ -222,7 +222,7 @@ public class AllTests String ref = "test"; for(int i = 0; i < ports.length; i++) { - ref += ":default -t 60000 -p " + ports[i]; + ref += ":default -p " + ports[i]; } Ice.ObjectPrx base = communicator.stringToProxy(ref); test(base != null); diff --git a/java/test/Ice/faultTolerance/run.py b/java/test/Ice/faultTolerance/run.py index 6e6003bbeae..c71fd66f916 100755 --- a/java/test/Ice/faultTolerance/run.py +++ b/java/test/Ice/faultTolerance/run.py @@ -40,3 +40,5 @@ clientProc.startReader() clientProc.waitTestSuccess() for p in serverProc: p.waitTestSuccess() + +TestUtil.cleanup() diff --git a/java/test/Ice/hold/AllTests.java b/java/test/Ice/hold/AllTests.java index e2603cca3d7..4999c70cd63 100644 --- a/java/test/Ice/hold/AllTests.java +++ b/java/test/Ice/hold/AllTests.java @@ -104,10 +104,10 @@ public class AllTests { out.print("testing stringToProxy... "); out.flush(); - String ref = "hold:default -p 12010 -t 60000"; + String ref = "hold:default -p 12010"; Ice.ObjectPrx base = communicator.stringToProxy(ref); test(base != null); - String refSerialized = "hold:default -p 12011 -t 60000"; + String refSerialized = "hold:default -p 12011"; Ice.ObjectPrx baseSerialized = communicator.stringToProxy(refSerialized); test(baseSerialized != null); out.println("ok"); diff --git a/java/test/Ice/hold/Server.java b/java/test/Ice/hold/Server.java index ae0a3a5939c..a932be78d16 100644 --- a/java/test/Ice/hold/Server.java +++ b/java/test/Ice/hold/Server.java @@ -38,13 +38,13 @@ public class Server extends test.Util.Application Ice.InitializationData initData = new Ice.InitializationData(); initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.hold"); - initData.properties.setProperty("TestAdapter1.Endpoints", "default -p 12010 -t 10000:udp"); + initData.properties.setProperty("TestAdapter1.Endpoints", "default -p 12010:udp"); initData.properties.setProperty("TestAdapter1.ThreadPool.Size", "5"); initData.properties.setProperty("TestAdapter1.ThreadPool.SizeMax", "5"); initData.properties.setProperty("TestAdapter1.ThreadPool.SizeWarn", "0"); initData.properties.setProperty("TestAdapter1.ThreadPool.Serialize", "0"); - initData.properties.setProperty("TestAdapter2.Endpoints", "default -p 12011 -t 10000:udp"); + initData.properties.setProperty("TestAdapter2.Endpoints", "default -p 12011:udp"); initData.properties.setProperty("TestAdapter2.ThreadPool.Size", "5"); initData.properties.setProperty("TestAdapter2.ThreadPool.SizeMax", "5"); initData.properties.setProperty("TestAdapter2.ThreadPool.SizeWarn", "0"); diff --git a/java/test/Ice/hold/run.py b/java/test/Ice/hold/run.py index bb34e7d35b7..56d48e628de 100755 --- a/java/test/Ice/hold/run.py +++ b/java/test/Ice/hold/run.py @@ -21,3 +21,5 @@ sys.path.append(os.path.join(path[0])) from scripts import * TestUtil.clientServerTest() + +TestUtil.cleanup() diff --git a/java/test/Ice/inheritance/AllTests.java b/java/test/Ice/inheritance/AllTests.java index 4e200a31d3f..f0c7af47896 100644 --- a/java/test/Ice/inheritance/AllTests.java +++ b/java/test/Ice/inheritance/AllTests.java @@ -39,7 +39,7 @@ public class AllTests { out.print("testing stringToProxy... "); out.flush(); - String ref = "initial:default -p 12010 -t 10000"; + String ref = "initial:default -p 12010"; Ice.ObjectPrx base = communicator.stringToProxy(ref); test(base != null); out.println("ok"); diff --git a/java/test/Ice/inheritance/Collocated.java b/java/test/Ice/inheritance/Collocated.java index 2081c9bfc7a..1b0a10dae07 100644 --- a/java/test/Ice/inheritance/Collocated.java +++ b/java/test/Ice/inheritance/Collocated.java @@ -28,7 +28,7 @@ public class Collocated extends test.Util.Application Ice.InitializationData initData = new Ice.InitializationData(); initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.inheritance"); - initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010"); return initData; } diff --git a/java/test/Ice/inheritance/Server.java b/java/test/Ice/inheritance/Server.java index 252e9ef26fe..1e7f2de6d68 100644 --- a/java/test/Ice/inheritance/Server.java +++ b/java/test/Ice/inheritance/Server.java @@ -26,7 +26,7 @@ public class Server extends test.Util.Application Ice.InitializationData initData = new Ice.InitializationData(); initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.inheritance"); - initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010"); return initData; } diff --git a/java/test/Ice/inheritance/run.py b/java/test/Ice/inheritance/run.py index 545214a74c7..979b91c2544 100755 --- a/java/test/Ice/inheritance/run.py +++ b/java/test/Ice/inheritance/run.py @@ -22,3 +22,5 @@ from scripts import * TestUtil.clientServerTest() TestUtil.collocatedTest() + +TestUtil.cleanup() diff --git a/java/test/Ice/interceptor/run.py b/java/test/Ice/interceptor/run.py index d91769dbe44..5d316e77541 100755 --- a/java/test/Ice/interceptor/run.py +++ b/java/test/Ice/interceptor/run.py @@ -26,3 +26,5 @@ print "ok" clientProc.startReader() clientProc.waitTestSuccess() + +TestUtil.cleanup() diff --git a/java/test/Ice/location/AllTests.java b/java/test/Ice/location/AllTests.java index 17c32a8a598..a54103299e1 100644 --- a/java/test/Ice/location/AllTests.java +++ b/java/test/Ice/location/AllTests.java @@ -38,7 +38,7 @@ public class AllTests allTests(Ice.Communicator communicator, PrintWriter out) { ServerManagerPrx manager = ServerManagerPrxHelper.checkedCast( - communicator.stringToProxy("ServerManager :default -t 10000 -p 12010")); + communicator.stringToProxy("ServerManager :default -p 12010")); test(manager != null); TestLocatorPrx locator = TestLocatorPrxHelper.uncheckedCast(communicator.getDefaultLocator()); diff --git a/java/test/Ice/location/Server.java b/java/test/Ice/location/Server.java index ee857be383b..97ab0d0c385 100644 --- a/java/test/Ice/location/Server.java +++ b/java/test/Ice/location/Server.java @@ -52,7 +52,7 @@ public class Server extends test.Util.Application initData.properties.setProperty("Ice.Package.Test", "test.Ice.location"); initData.properties.setProperty("Ice.ThreadPool.Server.Size", "2"); initData.properties.setProperty("Ice.ThreadPool.Server.SizeWarn", "0"); - initData.properties.setProperty("ServerManagerAdapter.Endpoints", "default -p 12010 -t 30000:udp"); + initData.properties.setProperty("ServerManagerAdapter.Endpoints", "default -p 12010:udp"); _initData = initData; return initData; diff --git a/java/test/Ice/location/ServerManagerI.java b/java/test/Ice/location/ServerManagerI.java index df5075fcf4a..a445bc8fcd1 100644 --- a/java/test/Ice/location/ServerManagerI.java +++ b/java/test/Ice/location/ServerManagerI.java @@ -62,7 +62,7 @@ public class ServerManagerI extends _ServerManagerDisp Ice.ObjectAdapter adapter = serverCommunicator.createObjectAdapter("TestAdapter"); Ice.ObjectAdapter adapter2 = serverCommunicator.createObjectAdapter("TestAdapter2"); - Ice.ObjectPrx locator = serverCommunicator.stringToProxy("locator:default -p 12010 -t 30000"); + Ice.ObjectPrx locator = serverCommunicator.stringToProxy("locator:default -p 12010"); adapter.setLocator(Ice.LocatorPrxHelper.uncheckedCast(locator)); adapter2.setLocator(Ice.LocatorPrxHelper.uncheckedCast(locator)); diff --git a/java/test/Ice/location/run.py b/java/test/Ice/location/run.py index bb34e7d35b7..56d48e628de 100755 --- a/java/test/Ice/location/run.py +++ b/java/test/Ice/location/run.py @@ -21,3 +21,5 @@ sys.path.append(os.path.join(path[0])) from scripts import * TestUtil.clientServerTest() + +TestUtil.cleanup() diff --git a/java/test/Ice/objects/AllTests.java b/java/test/Ice/objects/AllTests.java index c67efa5f7a0..ffebb642f5b 100644 --- a/java/test/Ice/objects/AllTests.java +++ b/java/test/Ice/objects/AllTests.java @@ -43,7 +43,7 @@ public class AllTests { out.print("testing stringToProxy... "); out.flush(); - String ref = "initial:default -p 12010 -t 10000"; + String ref = "initial:default -p 12010"; Ice.ObjectPrx base = communicator.stringToProxy(ref); test(base != null); out.println("ok"); @@ -205,7 +205,7 @@ public class AllTests { out.print("testing UnexpectedObjectException..."); out.flush(); - ref = "uoet:default -p 12010 -t 10000"; + ref = "uoet:default -p 12010"; base = communicator.stringToProxy(ref); test(base != null); UnexpectedObjectExceptionTestPrx uoet = UnexpectedObjectExceptionTestPrxHelper.uncheckedCast(base); diff --git a/java/test/Ice/objects/Collocated.java b/java/test/Ice/objects/Collocated.java index 15725ec1cb5..d5fc4c00b0c 100644 --- a/java/test/Ice/objects/Collocated.java +++ b/java/test/Ice/objects/Collocated.java @@ -16,7 +16,7 @@ public class Collocated extends test.Util.Application public int run(String[] args) { Ice.Communicator communicator = communicator(); - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); Initial initial = new InitialI(adapter); adapter.add(initial, communicator.stringToIdentity("initial")); diff --git a/java/test/Ice/objects/Server.java b/java/test/Ice/objects/Server.java index 1d16d6330af..7326efc81a7 100644 --- a/java/test/Ice/objects/Server.java +++ b/java/test/Ice/objects/Server.java @@ -61,7 +61,7 @@ public class Server extends test.Util.Application Ice.InitializationData initData = new Ice.InitializationData(); initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.objects"); - initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010"); return initData; } diff --git a/java/test/Ice/objects/run.py b/java/test/Ice/objects/run.py index 545214a74c7..979b91c2544 100755 --- a/java/test/Ice/objects/run.py +++ b/java/test/Ice/objects/run.py @@ -22,3 +22,5 @@ from scripts import * TestUtil.clientServerTest() TestUtil.collocatedTest() + +TestUtil.cleanup() diff --git a/java/test/Ice/operations/AMDServer.java b/java/test/Ice/operations/AMDServer.java index 880f3cb23bc..cef8f2f3dba 100644 --- a/java/test/Ice/operations/AMDServer.java +++ b/java/test/Ice/operations/AMDServer.java @@ -31,7 +31,7 @@ public class AMDServer extends test.Util.Application // initData.properties.setProperty("Ice.Warn.Dispatch", "0"); initData.properties.setProperty("Ice.Package.Test", "test.Ice.operations.AMD"); - initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 20000:udp"); + initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); return initData; } diff --git a/java/test/Ice/operations/AllTests.java b/java/test/Ice/operations/AllTests.java index e2a24b65ec4..593490d2548 100644 --- a/java/test/Ice/operations/AllTests.java +++ b/java/test/Ice/operations/AllTests.java @@ -21,7 +21,7 @@ public class AllTests allTests(test.Util.Application app, boolean collocated, PrintWriter out) { Ice.Communicator communicator = app.communicator(); - String ref = "test:default -p 12010 -t 20000"; + String ref = "test:default -p 12010"; Ice.ObjectPrx base = communicator.stringToProxy(ref); MyClassPrx cl = MyClassPrxHelper.checkedCast(base); MyDerivedClassPrx derived = MyDerivedClassPrxHelper.checkedCast(cl); diff --git a/java/test/Ice/operations/Collocated.java b/java/test/Ice/operations/Collocated.java index 84fbfeb1910..b2137d4c875 100644 --- a/java/test/Ice/operations/Collocated.java +++ b/java/test/Ice/operations/Collocated.java @@ -28,7 +28,7 @@ public class Collocated extends test.Util.Application Ice.InitializationData initData = new Ice.InitializationData(); initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.operations"); - initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 20000"); + initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010"); return initData; } diff --git a/java/test/Ice/operations/Twoways.java b/java/test/Ice/operations/Twoways.java index 588b9355ff4..791e42e5df9 100644 --- a/java/test/Ice/operations/Twoways.java +++ b/java/test/Ice/operations/Twoways.java @@ -718,7 +718,7 @@ class Twoways communicator.setDefaultContext(dflt); MyClassPrx c = MyClassPrxHelper.checkedCast( - communicator.stringToProxy("test:default -p 12010 -t 20000")); + communicator.stringToProxy("test:default -p 12010")); test(c.opContext().equals(dflt)); dflt.put("a", "c"); @@ -761,8 +761,7 @@ class Twoways ctx.put("two", "TWO"); ctx.put("three", "THREE"); - MyClassPrx p3 = MyClassPrxHelper.uncheckedCast( - ic.stringToProxy("test:default -p 12010 -t 20000")); + MyClassPrx p3 = MyClassPrxHelper.uncheckedCast(ic.stringToProxy("test:default -p 12010")); ic.getImplicitContext().setContext(ctx); test(ic.getImplicitContext().getContext().equals(ctx)); diff --git a/java/test/Ice/operations/TwowaysAMI.java b/java/test/Ice/operations/TwowaysAMI.java index cf942a3a473..cba0a49d11c 100644 --- a/java/test/Ice/operations/TwowaysAMI.java +++ b/java/test/Ice/operations/TwowaysAMI.java @@ -1624,7 +1624,7 @@ class TwowaysAMI communicator.setDefaultContext(dflt); MyClassPrx c = MyClassPrxHelper.checkedCast( - communicator.stringToProxy("test:default -p 12010 -t 10000")); + communicator.stringToProxy("test:default -p 12010")); { java.util.HashMap<String, String> tmp = new java.util.HashMap<String, String>(); tmp.put("a", "b"); @@ -1697,8 +1697,7 @@ class TwowaysAMI ctx.put("two", "TWO"); ctx.put("three", "THREE"); - MyClassPrx p3 = MyClassPrxHelper.uncheckedCast( - ic.stringToProxy("test:default -p 12010 -t 20000")); + MyClassPrx p3 = MyClassPrxHelper.uncheckedCast(ic.stringToProxy("test:default -p 12010")); ic.getImplicitContext().setContext(ctx); test(ic.getImplicitContext().getContext().equals(ctx)); diff --git a/java/test/Ice/operations/run.py b/java/test/Ice/operations/run.py index 07f6b811416..2cafe0a9bc1 100755 --- a/java/test/Ice/operations/run.py +++ b/java/test/Ice/operations/run.py @@ -28,3 +28,5 @@ TestUtil.clientServerTest(server="test.Ice.operations.AMDServer") print "tests with collocated server." TestUtil.collocatedTest() + +TestUtil.cleanup() diff --git a/java/test/Ice/packagemd/AllTests.java b/java/test/Ice/packagemd/AllTests.java index d9d89374de5..97522019bea 100644 --- a/java/test/Ice/packagemd/AllTests.java +++ b/java/test/Ice/packagemd/AllTests.java @@ -35,7 +35,7 @@ public class AllTests { out.print("testing stringToProxy... "); out.flush(); - String ref = "initial:default -p 12010 -t 10000"; + String ref = "initial:default -p 12010"; Ice.ObjectPrx base = communicator.stringToProxy(ref); test(base != null); out.println("ok"); diff --git a/java/test/Ice/packagemd/Server.java b/java/test/Ice/packagemd/Server.java index 541aa3c512a..929c019c40d 100644 --- a/java/test/Ice/packagemd/Server.java +++ b/java/test/Ice/packagemd/Server.java @@ -27,7 +27,7 @@ public class Server extends test.Util.Application initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.packagemd"); initData.properties.setProperty("Ice.Package.Test1", "test.Ice.packagemd"); - initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010"); return initData; } diff --git a/java/test/Ice/packagemd/run.py b/java/test/Ice/packagemd/run.py index bb34e7d35b7..56d48e628de 100755 --- a/java/test/Ice/packagemd/run.py +++ b/java/test/Ice/packagemd/run.py @@ -21,3 +21,5 @@ sys.path.append(os.path.join(path[0])) from scripts import * TestUtil.clientServerTest() + +TestUtil.cleanup() diff --git a/java/test/Ice/proxy/AMDServer.java b/java/test/Ice/proxy/AMDServer.java index ccca44fc02a..fa3d210b7dc 100644 --- a/java/test/Ice/proxy/AMDServer.java +++ b/java/test/Ice/proxy/AMDServer.java @@ -26,7 +26,7 @@ public class AMDServer extends test.Util.Application Ice.InitializationData initData = new Ice.InitializationData(); initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.proxy.AMD"); - initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp"); + initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); return initData; } diff --git a/java/test/Ice/proxy/AllTests.java b/java/test/Ice/proxy/AllTests.java index a2b54a1c01e..be483795c1d 100644 --- a/java/test/Ice/proxy/AllTests.java +++ b/java/test/Ice/proxy/AllTests.java @@ -31,7 +31,7 @@ public class AllTests { out.print("testing stringToProxy... "); out.flush(); - String ref = "test:default -p 12010 -t 10000"; + String ref = "test:default -p 12010"; Ice.ObjectPrx base = communicator.stringToProxy(ref); test(base != null); @@ -235,7 +235,7 @@ public class AllTests out.flush(); Ice.Properties prop = communicator.getProperties(); String propertyPrefix = "Foo.Proxy"; - prop.setProperty(propertyPrefix, "test:default -p 12010 -t 10000"); + prop.setProperty(propertyPrefix, "test:default -p 12010"); b1 = communicator.propertyToProxy(propertyPrefix); test(b1.ice_getIdentity().name.equals("test") && b1.ice_getIdentity().category.length() == 0 && b1.ice_getAdapterId().length() == 0 && b1.ice_getFacet().length() == 0); @@ -279,7 +279,7 @@ public class AllTests //test(b1.ice_getLocatorCacheTimeout() == 60); //prop.setProperty("Ice.Default.LocatorCacheTimeout", ""); - prop.setProperty(propertyPrefix, "test:default -p 12010 -t 10000"); + prop.setProperty(propertyPrefix, "test:default -p 12010"); property = propertyPrefix + ".Router"; test(b1.ice_getRouter() == null); diff --git a/java/test/Ice/proxy/Collocated.java b/java/test/Ice/proxy/Collocated.java index 14b2f385879..3f84336a3ef 100644 --- a/java/test/Ice/proxy/Collocated.java +++ b/java/test/Ice/proxy/Collocated.java @@ -14,7 +14,7 @@ public class Collocated extends test.Util.Application public int run(String[] args) { Ice.Communicator communicator = communicator(); - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); adapter.add(new MyDerivedClassI(), communicator.stringToIdentity("test")); adapter.activate(); diff --git a/java/test/Ice/proxy/run.py b/java/test/Ice/proxy/run.py index 4b6874e1f37..884a20ce0d6 100755 --- a/java/test/Ice/proxy/run.py +++ b/java/test/Ice/proxy/run.py @@ -28,3 +28,5 @@ TestUtil.clientServerTest(server="test.Ice.proxy.AMDServer") print "tests with collocated server." TestUtil.collocatedTest() + +TestUtil.cleanup() diff --git a/java/test/Ice/retry/AllTests.java b/java/test/Ice/retry/AllTests.java index a151a88e768..bdde4ea936e 100644 --- a/java/test/Ice/retry/AllTests.java +++ b/java/test/Ice/retry/AllTests.java @@ -120,7 +120,7 @@ public class AllTests { out.print("testing stringToProxy... "); out.flush(); - String ref = "retry:default -p 12010 -t 10000"; + String ref = "retry:default -p 12010"; Ice.ObjectPrx base1 = communicator.stringToProxy(ref); test(base1 != null); Ice.ObjectPrx base2 = communicator.stringToProxy(ref); diff --git a/java/test/Ice/retry/Server.java b/java/test/Ice/retry/Server.java index 95243590107..4da8ae9c6a7 100644 --- a/java/test/Ice/retry/Server.java +++ b/java/test/Ice/retry/Server.java @@ -25,7 +25,7 @@ public class Server extends test.Util.Application Ice.InitializationData initData = new Ice.InitializationData(); initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.retry"); - initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010"); return initData; } diff --git a/java/test/Ice/retry/run.py b/java/test/Ice/retry/run.py index bb34e7d35b7..56d48e628de 100755 --- a/java/test/Ice/retry/run.py +++ b/java/test/Ice/retry/run.py @@ -21,3 +21,5 @@ sys.path.append(os.path.join(path[0])) from scripts import * TestUtil.clientServerTest() + +TestUtil.cleanup() diff --git a/java/test/Ice/seqMapping/AllTests.java b/java/test/Ice/seqMapping/AllTests.java index 37b1df2d96d..a799a93e225 100644 --- a/java/test/Ice/seqMapping/AllTests.java +++ b/java/test/Ice/seqMapping/AllTests.java @@ -18,7 +18,7 @@ public class AllTests public static MyClassPrx allTests(Ice.Communicator communicator, boolean collocated, PrintWriter out) { - String ref = "test:default -p 12010 -t 10000"; + String ref = "test:default -p 12010"; Ice.ObjectPrx baseProxy = communicator.stringToProxy(ref); MyClassPrx cl = MyClassPrxHelper.checkedCast(baseProxy); diff --git a/java/test/Ice/seqMapping/Collocated.java b/java/test/Ice/seqMapping/Collocated.java index c394d4b28d3..defa0c1a421 100644 --- a/java/test/Ice/seqMapping/Collocated.java +++ b/java/test/Ice/seqMapping/Collocated.java @@ -31,7 +31,7 @@ public class Collocated extends test.Util.Application Ice.InitializationData initData = new Ice.InitializationData(); initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.seqMapping"); - initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010"); return initData; } diff --git a/java/test/Ice/seqMapping/run.py b/java/test/Ice/seqMapping/run.py index b361826c48f..8283dc5a7d5 100755 --- a/java/test/Ice/seqMapping/run.py +++ b/java/test/Ice/seqMapping/run.py @@ -28,3 +28,5 @@ TestUtil.clientServerTest(server="test.Ice.seqMapping.AMDServer") print "tests with collocated server." TestUtil.collocatedTest() + +TestUtil.cleanup() diff --git a/java/test/Ice/serialize/AllTests.java b/java/test/Ice/serialize/AllTests.java index ea69059e355..7ecbd8ec52c 100644 --- a/java/test/Ice/serialize/AllTests.java +++ b/java/test/Ice/serialize/AllTests.java @@ -25,7 +25,7 @@ public class AllTests public static InitialPrx allTests(Ice.Communicator communicator, boolean collocated, PrintWriter out) { - String ref = "initial:default -p 12010 -t 10000"; + String ref = "initial:default -p 12010"; Ice.ObjectPrx base = communicator.stringToProxy(ref); InitialPrx initial = InitialPrxHelper.checkedCast(base); diff --git a/java/test/Ice/serialize/Server.java b/java/test/Ice/serialize/Server.java index 93355a90da5..6f734a780eb 100644 --- a/java/test/Ice/serialize/Server.java +++ b/java/test/Ice/serialize/Server.java @@ -29,7 +29,7 @@ public class Server extends test.Util.Application Ice.InitializationData initData = new Ice.InitializationData(); initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.serialize"); - initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010"); return initData; } diff --git a/java/test/Ice/serialize/run.py b/java/test/Ice/serialize/run.py index bb34e7d35b7..56d48e628de 100755 --- a/java/test/Ice/serialize/run.py +++ b/java/test/Ice/serialize/run.py @@ -21,3 +21,5 @@ sys.path.append(os.path.join(path[0])) from scripts import * TestUtil.clientServerTest() + +TestUtil.cleanup() diff --git a/java/test/Ice/servantLocator/AMDServer.java b/java/test/Ice/servantLocator/AMDServer.java index 38764531a6a..2234ff7c4e7 100644 --- a/java/test/Ice/servantLocator/AMDServer.java +++ b/java/test/Ice/servantLocator/AMDServer.java @@ -27,7 +27,7 @@ public class AMDServer extends test.Util.Application Ice.InitializationData initData = new Ice.InitializationData(); initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.servantLocator.AMD"); - initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010"); initData.properties.setProperty("Ice.Warn.Dispatch", "0"); return initData; diff --git a/java/test/Ice/servantLocator/AllTests.java b/java/test/Ice/servantLocator/AllTests.java index 58d4c8b8e3e..16c0450f5d5 100644 --- a/java/test/Ice/servantLocator/AllTests.java +++ b/java/test/Ice/servantLocator/AllTests.java @@ -192,7 +192,7 @@ public class AllTests { out.print("testing stringToProxy... "); out.flush(); - String ref = "asm:default -p 12010 -t 10000"; + String ref = "asm:default -p 12010"; Ice.ObjectPrx base = communicator.stringToProxy(ref); test(base != null); out.println("ok"); @@ -208,7 +208,7 @@ public class AllTests out.flush(); try { - ObjectPrx o = communicator.stringToProxy("category/locate:default -p 12010 -t 10000"); + ObjectPrx o = communicator.stringToProxy("category/locate:default -p 12010"); o.ice_ids(); test(false); } @@ -223,7 +223,7 @@ public class AllTests try { - ObjectPrx o = communicator.stringToProxy("category/finished:default -p 12010 -t 10000"); + ObjectPrx o = communicator.stringToProxy("category/finished:default -p 12010"); o.ice_ids(); test(false); } @@ -239,11 +239,11 @@ public class AllTests out.print("testing servant locator... "); out.flush(); - base = communicator.stringToProxy("category/locate:default -p 12010 -t 10000"); + base = communicator.stringToProxy("category/locate:default -p 12010"); obj = TestIntfPrxHelper.checkedCast(base); try { - TestIntfPrxHelper.checkedCast(communicator.stringToProxy("category/unknown:default -p 12010 -t 10000")); + TestIntfPrxHelper.checkedCast(communicator.stringToProxy("category/unknown:default -p 12010")); } catch(ObjectNotExistException ex) { @@ -252,20 +252,20 @@ public class AllTests out.print("testing default servant locator... "); out.flush(); - base = communicator.stringToProxy("anothercat/locate:default -p 12010 -t 10000"); + base = communicator.stringToProxy("anothercat/locate:default -p 12010"); obj = TestIntfPrxHelper.checkedCast(base); - base = communicator.stringToProxy("locate:default -p 12010 -t 10000"); + base = communicator.stringToProxy("locate:default -p 12010"); obj = TestIntfPrxHelper.checkedCast(base); try { - TestIntfPrxHelper.checkedCast(communicator.stringToProxy("anothercat/unknown:default -p 12010 -t 10000")); + TestIntfPrxHelper.checkedCast(communicator.stringToProxy("anothercat/unknown:default -p 12010")); } catch(ObjectNotExistException ex) { } try { - TestIntfPrxHelper.checkedCast(communicator.stringToProxy("unknown:default -p 12010 -t 10000")); + TestIntfPrxHelper.checkedCast(communicator.stringToProxy("unknown:default -p 12010")); } catch(ObjectNotExistException ex) { @@ -274,14 +274,14 @@ public class AllTests out.print("testing locate exceptions... "); out.flush(); - base = communicator.stringToProxy("category/locate:default -p 12010 -t 10000"); + base = communicator.stringToProxy("category/locate:default -p 12010"); obj = TestIntfPrxHelper.checkedCast(base); testExceptions(obj, collocated); out.println("ok"); out.print("testing finished exceptions... "); out.flush(); - base = communicator.stringToProxy("category/finished:default -p 12010 -t 10000"); + base = communicator.stringToProxy("category/finished:default -p 12010"); obj = TestIntfPrxHelper.checkedCast(base); testExceptions(obj, collocated); out.println("ok"); diff --git a/java/test/Ice/servantLocator/Collocated.java b/java/test/Ice/servantLocator/Collocated.java index d8f8e383ba0..d47f4459683 100644 --- a/java/test/Ice/servantLocator/Collocated.java +++ b/java/test/Ice/servantLocator/Collocated.java @@ -28,7 +28,7 @@ public class Collocated extends test.Util.Application Ice.InitializationData initData = new Ice.InitializationData(); initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.servantLocator"); - initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010"); initData.properties.setProperty("Ice.Warn.Dispatch", "0"); return initData; diff --git a/java/test/Ice/servantLocator/Server.java b/java/test/Ice/servantLocator/Server.java index 26ee4fa9769..b349abdca3f 100644 --- a/java/test/Ice/servantLocator/Server.java +++ b/java/test/Ice/servantLocator/Server.java @@ -26,7 +26,7 @@ public class Server extends test.Util.Application Ice.InitializationData initData = new Ice.InitializationData(); initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.servantLocator"); - initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010"); initData.properties.setProperty("Ice.Warn.Dispatch", "0"); return initData; diff --git a/java/test/Ice/servantLocator/run.py b/java/test/Ice/servantLocator/run.py index 829444ed8a2..e59cdae0d46 100755 --- a/java/test/Ice/servantLocator/run.py +++ b/java/test/Ice/servantLocator/run.py @@ -28,3 +28,5 @@ TestUtil.clientServerTest(server="test.Ice.servantLocator.AMDServer") print "tests with collocated server." TestUtil.collocatedTest() + +TestUtil.cleanup() diff --git a/java/test/Ice/slicing/exceptions/run.py b/java/test/Ice/slicing/exceptions/run.py index ed56aea4e71..5874eea18e8 100755 --- a/java/test/Ice/slicing/exceptions/run.py +++ b/java/test/Ice/slicing/exceptions/run.py @@ -28,3 +28,5 @@ import copy amdenv = copy.deepcopy(os.environ) TestUtil.addClasspath(os.path.join(os.getcwd(), "..", "exceptionsAMD", "classes"), amdenv) TestUtil.clientServerTest(serverenv = amdenv) + +TestUtil.cleanup() diff --git a/java/test/Ice/slicing/objects/run.py b/java/test/Ice/slicing/objects/run.py index 5d357e042ef..0ee80b7f64a 100755 --- a/java/test/Ice/slicing/objects/run.py +++ b/java/test/Ice/slicing/objects/run.py @@ -34,3 +34,5 @@ import copy amdenv = copy.deepcopy(os.environ) TestUtil.addClasspath(os.path.join(os.getcwd(), "..", "objectsAMD", "classes"), amdenv) TestUtil.clientServerTest(serverenv = amdenv) + +TestUtil.cleanup() diff --git a/java/test/Ice/stream/run.py b/java/test/Ice/stream/run.py index 4e8769e647c..32da652d782 100755 --- a/java/test/Ice/stream/run.py +++ b/java/test/Ice/stream/run.py @@ -26,3 +26,5 @@ print "ok" clientProc.startReader() clientProc.waitTestSuccess() + +TestUtil.cleanup() diff --git a/java/test/Ice/timeout/AllTests.java b/java/test/Ice/timeout/AllTests.java index aa431bb4947..a68978445c4 100644 --- a/java/test/Ice/timeout/AllTests.java +++ b/java/test/Ice/timeout/AllTests.java @@ -168,7 +168,7 @@ public class AllTests { Ice.Communicator communicator = app.communicator(); - String sref = "timeout:default -p 12010 -t 10000"; + String sref = "timeout:default -p 12010"; Ice.ObjectPrx obj = communicator.stringToProxy(sref); test(obj != null); diff --git a/java/test/Ice/timeout/Server.java b/java/test/Ice/timeout/Server.java index d111ebf008a..806a658edc5 100644 --- a/java/test/Ice/timeout/Server.java +++ b/java/test/Ice/timeout/Server.java @@ -25,7 +25,7 @@ public class Server extends test.Util.Application Ice.InitializationData initData = new Ice.InitializationData(); initData.properties = Ice.Util.createProperties(argsH); initData.properties.setProperty("Ice.Package.Test", "test.Ice.timeout"); - initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); + initData.properties.setProperty("TestAdapter.Endpoints", "default -p 12010"); // // This test kills connections, so we don't want warnings. diff --git a/java/test/Ice/timeout/run.py b/java/test/Ice/timeout/run.py index bb34e7d35b7..56d48e628de 100755 --- a/java/test/Ice/timeout/run.py +++ b/java/test/Ice/timeout/run.py @@ -21,3 +21,5 @@ sys.path.append(os.path.join(path[0])) from scripts import * TestUtil.clientServerTest() + +TestUtil.cleanup() diff --git a/java/test/Ice/udp/run.py b/java/test/Ice/udp/run.py index ed8fbcc4ccf..8f7de9ad621 100755 --- a/java/test/Ice/udp/run.py +++ b/java/test/Ice/udp/run.py @@ -38,3 +38,5 @@ clientProc.startReader() clientProc.waitTestSuccess() for p in serverProc: p.waitTestSuccess() + +TestUtil.cleanup() diff --git a/java/test/IceBox/configuration/run.py b/java/test/IceBox/configuration/run.py index 67461502cce..fc00938b0d6 100755 --- a/java/test/IceBox/configuration/run.py +++ b/java/test/IceBox/configuration/run.py @@ -24,3 +24,5 @@ TestUtil.clientServerTest(additionalServerOptions="--Ice.Config=%s" % os.path.jo server=TestUtil.getIceBox()) TestUtil.clientServerTest(additionalServerOptions="--Ice.Config=%s" % os.path.join(os.getcwd(), "config.icebox2"), server=TestUtil.getIceBox()) + +TestUtil.cleanup() diff --git a/java/test/IceGrid/simple/run.py b/java/test/IceGrid/simple/run.py index 4455f5e40e0..ce382bc51f3 100755 --- a/java/test/IceGrid/simple/run.py +++ b/java/test/IceGrid/simple/run.py @@ -29,3 +29,5 @@ IceGridAdmin.iceGridClientServerTest("", "--TestAdapter.Endpoints=default --Test # Test client/server with on demand activation. # IceGridAdmin.iceGridTest("simple_server.xml", "--with-deploy") + +TestUtil.cleanup() diff --git a/java/test/IceSSL/configuration/AllTests.java b/java/test/IceSSL/configuration/AllTests.java index 962e287c929..ad163e7e284 100644 --- a/java/test/IceSSL/configuration/AllTests.java +++ b/java/test/IceSSL/configuration/AllTests.java @@ -71,7 +71,7 @@ public class AllTests allTests(test.Util.Application app, String testDir, PrintWriter out) { Ice.Communicator communicator = app.communicator(); - final String factoryRef = "factory:tcp -p 12010 -t 10000"; + final String factoryRef = "factory:tcp -p 12010"; Ice.ObjectPrx b = communicator.stringToProxy(factoryRef); test(b != null); ServerFactoryPrx factory = ServerFactoryPrxHelper.checkedCast(b); diff --git a/java/test/IceSSL/configuration/run.py b/java/test/IceSSL/configuration/run.py index 154cffc869d..7c9c2a9ec07 100755 --- a/java/test/IceSSL/configuration/run.py +++ b/java/test/IceSSL/configuration/run.py @@ -23,3 +23,5 @@ from scripts import * testdir = os.getcwd() TestUtil.clientServerTest(additionalClientOptions=testdir) + +TestUtil.cleanup() diff --git a/java/test/IceUtil/inputUtil/run.py b/java/test/IceUtil/inputUtil/run.py index cc4d1e94df2..2083ea1fcc4 100755 --- a/java/test/IceUtil/inputUtil/run.py +++ b/java/test/IceUtil/inputUtil/run.py @@ -25,3 +25,5 @@ clientProc = TestUtil.startClient("test.IceUtil.inputUtil.Client",startReader=Fa print "ok" clientProc.startReader() clientProc.waitTestSuccess() + +TestUtil.cleanup() diff --git a/java/test/Slice/keyword/run.py b/java/test/Slice/keyword/run.py index 4feb349fa01..ac3960ffafc 100755 --- a/java/test/Slice/keyword/run.py +++ b/java/test/Slice/keyword/run.py @@ -25,3 +25,5 @@ clientProc = TestUtil.startClient("test.Slice.keyword.Client",startReader=False) print "ok" clientProc.startReader() clientProc.waitTestSuccess() + +TestUtil.cleanup() diff --git a/php/test/Ice/binding/Client.php b/php/test/Ice/binding/Client.php index a2373416f9b..d5c709a0177 100644 --- a/php/test/Ice/binding/Client.php +++ b/php/test/Ice/binding/Client.php @@ -55,7 +55,7 @@ function allTests() { global $ICE; - $ref = "communicator:default -p 12010 -t 10000"; + $ref = "communicator:default -p 12010"; $com = $ICE->stringToProxy($ref)->ice_uncheckedCast("::Test::RemoteCommunicator"); echo "testing binding with single endpoint... "; diff --git a/php/test/Ice/binding/run.py b/php/test/Ice/binding/run.py index bb34e7d35b7..56d48e628de 100755 --- a/php/test/Ice/binding/run.py +++ b/php/test/Ice/binding/run.py @@ -21,3 +21,5 @@ sys.path.append(os.path.join(path[0])) from scripts import * TestUtil.clientServerTest() + +TestUtil.cleanup() diff --git a/php/test/Ice/exceptions/Client.php b/php/test/Ice/exceptions/Client.php index 94757432e9e..445c5b8c023 100644 --- a/php/test/Ice/exceptions/Client.php +++ b/php/test/Ice/exceptions/Client.php @@ -32,7 +32,7 @@ function allTests() echo "testing stringToProxy... "; flush(); - $ref = "thrower:default -p 12010 -t 2000"; + $ref = "thrower:default -p 12010"; $base = $ICE->stringToProxy($ref); test($base != null); echo "ok\n"; diff --git a/php/test/Ice/exceptions/run.py b/php/test/Ice/exceptions/run.py index 76e256c3c6a..26f9f4f7a9e 100755 --- a/php/test/Ice/exceptions/run.py +++ b/php/test/Ice/exceptions/run.py @@ -24,3 +24,5 @@ print "tests with regular server." TestUtil.clientServerTest() print "tests with AMD server." TestUtil.clientServerTest(server="serveramd") + +TestUtil.cleanup() diff --git a/php/test/Ice/facets/Client.php b/php/test/Ice/facets/Client.php index d7c37dc06c3..f6797c06624 100644 --- a/php/test/Ice/facets/Client.php +++ b/php/test/Ice/facets/Client.php @@ -32,7 +32,7 @@ function allTests() echo "testing stringToProxy... "; flush(); - $ref = "d:default -p 12010 -t 2000"; + $ref = "d:default -p 12010"; $db = $ICE->stringToProxy($ref); test($db != null); echo "ok\n"; diff --git a/php/test/Ice/facets/run.py b/php/test/Ice/facets/run.py index bb34e7d35b7..56d48e628de 100755 --- a/php/test/Ice/facets/run.py +++ b/php/test/Ice/facets/run.py @@ -21,3 +21,5 @@ sys.path.append(os.path.join(path[0])) from scripts import * TestUtil.clientServerTest() + +TestUtil.cleanup() diff --git a/php/test/Ice/inheritance/Client.php b/php/test/Ice/inheritance/Client.php index 47d287a85b2..d9634df6638 100644 --- a/php/test/Ice/inheritance/Client.php +++ b/php/test/Ice/inheritance/Client.php @@ -32,7 +32,7 @@ function allTests() echo "testing stringToProxy... "; flush(); - $ref = "initial:default -p 12010 -t 2000"; + $ref = "initial:default -p 12010"; $base = $ICE->stringToProxy($ref); test($base != null); echo "ok\n"; diff --git a/php/test/Ice/inheritance/run.py b/php/test/Ice/inheritance/run.py index bb34e7d35b7..56d48e628de 100755 --- a/php/test/Ice/inheritance/run.py +++ b/php/test/Ice/inheritance/run.py @@ -21,3 +21,5 @@ sys.path.append(os.path.join(path[0])) from scripts import * TestUtil.clientServerTest() + +TestUtil.cleanup() diff --git a/php/test/Ice/objects/Client.php b/php/test/Ice/objects/Client.php index 9b0a16ef86b..491ae8b4656 100644 --- a/php/test/Ice/objects/Client.php +++ b/php/test/Ice/objects/Client.php @@ -161,7 +161,7 @@ function allTests() echo "testing stringToProxy... "; flush(); - $ref = "initial:default -p 12010 -t 2000"; + $ref = "initial:default -p 12010"; $base = $ICE->stringToProxy($ref); test($base != null); echo "ok\n"; @@ -336,7 +336,7 @@ function allTests() echo "testing UnexpectedObjectException... "; flush(); - $ref = "uoet:default -p 12010 -t 2000"; + $ref = "uoet:default -p 12010"; $base = $ICE->stringToProxy($ref); test($base != null); $uoet = $base->ice_uncheckedCast("::Test::UnexpectedObjectExceptionTest"); diff --git a/php/test/Ice/objects/run.py b/php/test/Ice/objects/run.py index bb34e7d35b7..56d48e628de 100755 --- a/php/test/Ice/objects/run.py +++ b/php/test/Ice/objects/run.py @@ -21,3 +21,5 @@ sys.path.append(os.path.join(path[0])) from scripts import * TestUtil.clientServerTest() + +TestUtil.cleanup() diff --git a/php/test/Ice/operations/Client.php b/php/test/Ice/operations/Client.php index 6706b56a124..1a2da5ac957 100644 --- a/php/test/Ice/operations/Client.php +++ b/php/test/Ice/operations/Client.php @@ -421,7 +421,7 @@ function allTests() { global $ICE; - $ref = "test:default -p 12010 -t 2000"; + $ref = "test:default -p 12010"; $base = $ICE->stringToProxy($ref); $cl = $base->ice_checkedCast("::Test::MyClass"); $derived = $cl->ice_checkedCast("::Test::MyDerivedClass"); diff --git a/php/test/Ice/operations/run.py b/php/test/Ice/operations/run.py index 76e256c3c6a..26f9f4f7a9e 100755 --- a/php/test/Ice/operations/run.py +++ b/php/test/Ice/operations/run.py @@ -24,3 +24,5 @@ print "tests with regular server." TestUtil.clientServerTest() print "tests with AMD server." TestUtil.clientServerTest(server="serveramd") + +TestUtil.cleanup() diff --git a/php/test/Ice/proxy/Client.php b/php/test/Ice/proxy/Client.php index ecb63fb2f16..cb2ed79280f 100644 --- a/php/test/Ice/proxy/Client.php +++ b/php/test/Ice/proxy/Client.php @@ -32,7 +32,7 @@ function allTests() echo "testing stringToProxy... "; flush(); - $ref = "test:default -p 12010 -t 2000"; + $ref = "test:default -p 12010"; $base = $ICE->stringToProxy($ref); test($base != null); @@ -234,7 +234,7 @@ function allTests() echo "testing propertyToProxy... "; $propertyPrefix = "Foo.Proxy"; - $ICE->setProperty($propertyPrefix, "test:default -p 12010 -t 10000"); + $ICE->setProperty($propertyPrefix, "test:default -p 12010"); $b1 = $ICE->propertyToProxy($propertyPrefix); test($b1->ice_getIdentity()->name == "test" && $b1->ice_getIdentity()->category == "" && $b1->ice_getAdapterId() == "" && $b1->ice_getFacet() == ""); @@ -282,7 +282,7 @@ function allTests() //test($b1->ice_getLocatorCacheTimeout() == 60); //$ICE->setProperty("Ice.Default.LocatorCacheTimeout", ""); - $ICE->setProperty($propertyPrefix, "test:default -p 12010 -t 10000"); + $ICE->setProperty($propertyPrefix, "test:default -p 12010"); $property = $propertyPrefix . ".Router"; test(!$b1->ice_getRouter()); diff --git a/php/test/Ice/proxy/run.py b/php/test/Ice/proxy/run.py index 76e256c3c6a..26f9f4f7a9e 100755 --- a/php/test/Ice/proxy/run.py +++ b/php/test/Ice/proxy/run.py @@ -24,3 +24,5 @@ print "tests with regular server." TestUtil.clientServerTest() print "tests with AMD server." TestUtil.clientServerTest(server="serveramd") + +TestUtil.cleanup() diff --git a/php/test/Ice/slicing/exceptions/run.py b/php/test/Ice/slicing/exceptions/run.py index b85e4a1a4b3..f16ed7e4a05 100755 --- a/php/test/Ice/slicing/exceptions/run.py +++ b/php/test/Ice/slicing/exceptions/run.py @@ -21,3 +21,5 @@ sys.path.append(os.path.join(path[0])) from scripts import * TestUtil.clientServerTest() + +TestUtil.cleanup() diff --git a/php/test/Ice/slicing/objects/run.py b/php/test/Ice/slicing/objects/run.py index b85e4a1a4b3..f16ed7e4a05 100755 --- a/php/test/Ice/slicing/objects/run.py +++ b/php/test/Ice/slicing/objects/run.py @@ -21,3 +21,5 @@ sys.path.append(os.path.join(path[0])) from scripts import * TestUtil.clientServerTest() + +TestUtil.cleanup() diff --git a/php/test/Slice/keyword/run.py b/php/test/Slice/keyword/run.py index 12d908afc77..f559459fe89 100755 --- a/php/test/Slice/keyword/run.py +++ b/php/test/Slice/keyword/run.py @@ -29,3 +29,5 @@ clientProc = TestUtil.startClient(client, startReader = False) print "ok" clientProc.startReader() clientProc.waitTestSuccess() + +TestUtil.cleanup() diff --git a/py/allTests.py b/py/allTests.py index 459dd846e59..02a05d6cc8b 100755 --- a/py/allTests.py +++ b/py/allTests.py @@ -42,7 +42,7 @@ tests = [ ("Ice/retry", ["core"]), ("Ice/timeout", ["core"]), ("Ice/servantLocator", ["core"]), - ("Ice/blobject", ["core"]) + ("Ice/blobject", ["core"]), ("Ice/defaultServant", ["core"]) ] diff --git a/py/test/Ice/adapterDeactivation/AllTests.py b/py/test/Ice/adapterDeactivation/AllTests.py index a4f8327ce79..7ccf39a4b45 100644 --- a/py/test/Ice/adapterDeactivation/AllTests.py +++ b/py/test/Ice/adapterDeactivation/AllTests.py @@ -16,7 +16,7 @@ def test(b): def allTests(communicator): print "testing stringToProxy... ", sys.stdout.flush() - base = communicator.stringToProxy("test:default -p 12010 -t 10000") + base = communicator.stringToProxy("test:default -p 12010") test(base) print "ok" diff --git a/py/test/Ice/adapterDeactivation/Collocated.py b/py/test/Ice/adapterDeactivation/Collocated.py index 398be7dce3a..6aa860cf470 100755 --- a/py/test/Ice/adapterDeactivation/Collocated.py +++ b/py/test/Ice/adapterDeactivation/Collocated.py @@ -16,7 +16,7 @@ import Test, TestI, AllTests class TestServer(Ice.Application): def run(self, args): - self.communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000") + self.communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010") adapter = self.communicator().createObjectAdapter("TestAdapter") locator = TestI.ServantLocatorI() diff --git a/py/test/Ice/adapterDeactivation/Server.py b/py/test/Ice/adapterDeactivation/Server.py index ed1d17c1ae2..27b4232aee7 100755 --- a/py/test/Ice/adapterDeactivation/Server.py +++ b/py/test/Ice/adapterDeactivation/Server.py @@ -15,7 +15,7 @@ import Test, TestI class TestServer(Ice.Application): def run(self, args): - self.communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp") + self.communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp") adapter = self.communicator().createObjectAdapter("TestAdapter") locator = TestI.ServantLocatorI() diff --git a/py/test/Ice/adapterDeactivation/run.py b/py/test/Ice/adapterDeactivation/run.py index 545214a74c7..979b91c2544 100755 --- a/py/test/Ice/adapterDeactivation/run.py +++ b/py/test/Ice/adapterDeactivation/run.py @@ -22,3 +22,5 @@ from scripts import * TestUtil.clientServerTest() TestUtil.collocatedTest() + +TestUtil.cleanup() diff --git a/py/test/Ice/binding/AllTests.py b/py/test/Ice/binding/AllTests.py index f206fa7b9ed..1100927e1e9 100644 --- a/py/test/Ice/binding/AllTests.py +++ b/py/test/Ice/binding/AllTests.py @@ -58,7 +58,7 @@ def deactivate(com, adapters): com.deactivateObjectAdapter(p) def allTests(communicator): - ref = "communicator:default -p 12010 -t 10000" + ref = "communicator:default -p 12010" com = Test.RemoteCommunicatorPrx.uncheckedCast(communicator.stringToProxy(ref)) print "testing binding with single endpoint...", diff --git a/py/test/Ice/binding/Server.py b/py/test/Ice/binding/Server.py index 58ccfe49715..fb64264e8b4 100755 --- a/py/test/Ice/binding/Server.py +++ b/py/test/Ice/binding/Server.py @@ -16,7 +16,7 @@ import Test, TestI def run(args, communicator): communicator.getProperties().setProperty("Ice.Warn.Connections", "0") - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp") + communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp") adapter = communicator.createObjectAdapter("TestAdapter") id = communicator.stringToIdentity("communicator") adapter.add(TestI.RemoteCommunicatorI(), id) diff --git a/py/test/Ice/binding/run.py b/py/test/Ice/binding/run.py index bb34e7d35b7..56d48e628de 100755 --- a/py/test/Ice/binding/run.py +++ b/py/test/Ice/binding/run.py @@ -21,3 +21,5 @@ sys.path.append(os.path.join(path[0])) from scripts import * TestUtil.clientServerTest() + +TestUtil.cleanup() diff --git a/py/test/Ice/blobject/Client.py b/py/test/Ice/blobject/Client.py index 306b510102b..253565e9064 100755 --- a/py/test/Ice/blobject/Client.py +++ b/py/test/Ice/blobject/Client.py @@ -20,7 +20,7 @@ def test(b): raise RuntimeError('test assertion failed') def run(args, communicator, sync): - hello = Test.HelloPrx.checkedCast(communicator.stringToProxy("test:default -p 12010 -t 10000")) + hello = Test.HelloPrx.checkedCast(communicator.stringToProxy("test:default -p 12010")) hello.sayHello(False) hello.sayHello(False, { "_fwd":"o" } ) test(hello.add(10, 20) == 30) diff --git a/py/test/Ice/blobject/Server.py b/py/test/Ice/blobject/Server.py index e6f7c58bbe2..5be8f7be478 100755 --- a/py/test/Ice/blobject/Server.py +++ b/py/test/Ice/blobject/Server.py @@ -31,7 +31,7 @@ class TestI(Test.Hello): def run(args, communicator): - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp") + communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp") adapter = communicator.createObjectAdapter("TestAdapter") adapter.add(TestI(), communicator.stringToIdentity("test")) adapter.activate() diff --git a/py/test/Ice/blobject/run.py b/py/test/Ice/blobject/run.py index 03898f6ba88..9e71481ed14 100755 --- a/py/test/Ice/blobject/run.py +++ b/py/test/Ice/blobject/run.py @@ -26,3 +26,5 @@ sys.path.append(os.path.join(path[0])) from scripts import * TestUtil.clientServerTest() + +TestUtil.cleanup() diff --git a/py/test/Ice/checksum/AllTests.py b/py/test/Ice/checksum/AllTests.py index 08ca0071bec..f7544cfe468 100644 --- a/py/test/Ice/checksum/AllTests.py +++ b/py/test/Ice/checksum/AllTests.py @@ -14,7 +14,7 @@ def test(b): raise RuntimeError('test assertion failed') def allTests(communicator): - ref = "test:default -p 12010 -t 10000" + ref = "test:default -p 12010" base = communicator.stringToProxy(ref) test(base) diff --git a/py/test/Ice/checksum/Server.py b/py/test/Ice/checksum/Server.py index 91bb564f59a..7c6b3d2579e 100755 --- a/py/test/Ice/checksum/Server.py +++ b/py/test/Ice/checksum/Server.py @@ -30,7 +30,7 @@ class ChecksumI(Test.Checksum): self._adapter.getCommunicator().shutdown() def run(args, communicator): - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000") + communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010") adapter = communicator.createObjectAdapter("TestAdapter") object = ChecksumI(adapter) adapter.add(object, communicator.stringToIdentity("test")) diff --git a/py/test/Ice/checksum/run.py b/py/test/Ice/checksum/run.py index bb34e7d35b7..56d48e628de 100755 --- a/py/test/Ice/checksum/run.py +++ b/py/test/Ice/checksum/run.py @@ -21,3 +21,5 @@ sys.path.append(os.path.join(path[0])) from scripts import * TestUtil.clientServerTest() + +TestUtil.cleanup() diff --git a/py/test/Ice/custom/AllTests.py b/py/test/Ice/custom/AllTests.py index 57b4d6369ed..fea91b9ce70 100644 --- a/py/test/Ice/custom/AllTests.py +++ b/py/test/Ice/custom/AllTests.py @@ -14,7 +14,7 @@ def test(b): raise RuntimeError('test assertion failed') def allTests(communicator): - ref = "test:default -p 12010 -t 10000" + ref = "test:default -p 12010" base = communicator.stringToProxy(ref) test(base) diff --git a/py/test/Ice/custom/Server.py b/py/test/Ice/custom/Server.py index 718cb7df415..256afc9b6e4 100755 --- a/py/test/Ice/custom/Server.py +++ b/py/test/Ice/custom/Server.py @@ -78,7 +78,7 @@ class CustomI(Test.Custom): self._adapter.getCommunicator().shutdown() def run(args, communicator): - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000") + communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010") adapter = communicator.createObjectAdapter("TestAdapter") object = CustomI(adapter) adapter.add(object, communicator.stringToIdentity("test")) diff --git a/py/test/Ice/custom/run.py b/py/test/Ice/custom/run.py index bb34e7d35b7..56d48e628de 100755 --- a/py/test/Ice/custom/run.py +++ b/py/test/Ice/custom/run.py @@ -21,3 +21,5 @@ sys.path.append(os.path.join(path[0])) from scripts import * TestUtil.clientServerTest() + +TestUtil.cleanup() diff --git a/py/test/Ice/defaultServant/run.py b/py/test/Ice/defaultServant/run.py index 4bafa789a82..f4bd81310ba 100755 --- a/py/test/Ice/defaultServant/run.py +++ b/py/test/Ice/defaultServant/run.py @@ -26,3 +26,5 @@ print "ok" clientProc.startReader() clientProc.waitTestSuccess() + +TestUtil.cleanup() diff --git a/py/test/Ice/exceptions/AllTests.py b/py/test/Ice/exceptions/AllTests.py index 5e241a2761a..610a5cddbc3 100644 --- a/py/test/Ice/exceptions/AllTests.py +++ b/py/test/Ice/exceptions/AllTests.py @@ -333,7 +333,7 @@ def allTests(communicator): print "ok" print "testing stringToProxy...", - ref = "thrower:default -p 12010 -t 10000" + ref = "thrower:default -p 12010" base = communicator.stringToProxy(ref) test(base) print "ok" diff --git a/py/test/Ice/exceptions/Collocated.py b/py/test/Ice/exceptions/Collocated.py index 5b873dd9ce8..b07d4acdfba 100755 --- a/py/test/Ice/exceptions/Collocated.py +++ b/py/test/Ice/exceptions/Collocated.py @@ -17,7 +17,7 @@ import Test, TestI, AllTests def run(args, communicator): properties = communicator.getProperties() properties.setProperty("Ice.Warn.Dispatch", "0") - properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000") + properties.setProperty("TestAdapter.Endpoints", "default -p 12010") adapter = communicator.createObjectAdapter("TestAdapter") object = TestI.ThrowerI(adapter) adapter.add(object, communicator.stringToIdentity("thrower")) diff --git a/py/test/Ice/exceptions/Server.py b/py/test/Ice/exceptions/Server.py index b1d5c499bc0..4706d57d0a1 100755 --- a/py/test/Ice/exceptions/Server.py +++ b/py/test/Ice/exceptions/Server.py @@ -17,7 +17,7 @@ import Test, TestI def run(args, communicator): properties = communicator.getProperties() properties.setProperty("Ice.Warn.Dispatch", "0") - properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp") + properties.setProperty("TestAdapter.Endpoints", "default -p 12010:udp") adapter = communicator.createObjectAdapter("TestAdapter") object = TestI.ThrowerI(adapter) adapter.add(object, communicator.stringToIdentity("thrower")) diff --git a/py/test/Ice/exceptions/ServerAMD.py b/py/test/Ice/exceptions/ServerAMD.py index 3eaa1dfa327..ca9ecd81761 100755 --- a/py/test/Ice/exceptions/ServerAMD.py +++ b/py/test/Ice/exceptions/ServerAMD.py @@ -115,7 +115,7 @@ class ThrowerI(Test.Thrower): def run(args, communicator): properties = communicator.getProperties() properties.setProperty("Ice.Warn.Dispatch", "0") - properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp") + properties.setProperty("TestAdapter.Endpoints", "default -p 12010:udp") adapter = communicator.createObjectAdapter("TestAdapter") object = ThrowerI(adapter) adapter.add(object, communicator.stringToIdentity("thrower")) diff --git a/py/test/Ice/exceptions/run.py b/py/test/Ice/exceptions/run.py index cbcf10f321e..5d889c09168 100755 --- a/py/test/Ice/exceptions/run.py +++ b/py/test/Ice/exceptions/run.py @@ -26,3 +26,5 @@ print "tests with AMD server." TestUtil.clientServerTest(server="ServerAMD.py") print "tests with collocated server." TestUtil.collocatedTest() + +TestUtil.cleanup() diff --git a/py/test/Ice/facets/AllTests.py b/py/test/Ice/facets/AllTests.py index 78a665e2687..03ff5015acc 100644 --- a/py/test/Ice/facets/AllTests.py +++ b/py/test/Ice/facets/AllTests.py @@ -86,7 +86,7 @@ def allTests(communicator): adapter.deactivate() print "testing stringToProxy... ", - ref = "d:default -p 12010 -t 10000" + ref = "d:default -p 12010" db = communicator.stringToProxy(ref) test(db) print "ok" diff --git a/py/test/Ice/facets/Collocated.py b/py/test/Ice/facets/Collocated.py index 1bcb1fb959f..6ecaa738fea 100755 --- a/py/test/Ice/facets/Collocated.py +++ b/py/test/Ice/facets/Collocated.py @@ -15,7 +15,7 @@ Ice.loadSlice('Test.ice') import Test, TestI, AllTests def run(args, communicator): - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000") + communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010") adapter = communicator.createObjectAdapter("TestAdapter") d = TestI.DI() adapter.add(d, communicator.stringToIdentity("d")) diff --git a/py/test/Ice/facets/Server.py b/py/test/Ice/facets/Server.py index f2aa1777029..7f2b9346b69 100755 --- a/py/test/Ice/facets/Server.py +++ b/py/test/Ice/facets/Server.py @@ -15,7 +15,7 @@ Ice.loadSlice('Test.ice') import Test, TestI def run(args, communicator): - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000") + communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010") adapter = communicator.createObjectAdapter("TestAdapter") d = TestI.DI() adapter.add(d, communicator.stringToIdentity("d")) diff --git a/py/test/Ice/facets/run.py b/py/test/Ice/facets/run.py index 545214a74c7..979b91c2544 100755 --- a/py/test/Ice/facets/run.py +++ b/py/test/Ice/facets/run.py @@ -22,3 +22,5 @@ from scripts import * TestUtil.clientServerTest() TestUtil.collocatedTest() + +TestUtil.cleanup() diff --git a/py/test/Ice/faultTolerance/AllTests.py b/py/test/Ice/faultTolerance/AllTests.py index 1c8d7dfc021..0d6298673ae 100644 --- a/py/test/Ice/faultTolerance/AllTests.py +++ b/py/test/Ice/faultTolerance/AllTests.py @@ -85,7 +85,7 @@ def allTests(communicator, ports): print "testing stringToProxy... ", ref = "test" for p in ports: - ref = ref + ":default -t 60000 -p " + str(p) + ref = ref + ":default -p " + str(p) base = communicator.stringToProxy(ref) test(base) print "ok" diff --git a/py/test/Ice/faultTolerance/run.py b/py/test/Ice/faultTolerance/run.py index 1b4a6840bf1..45a5cb02f73 100755 --- a/py/test/Ice/faultTolerance/run.py +++ b/py/test/Ice/faultTolerance/run.py @@ -44,3 +44,5 @@ clientProc.startReader() clientProc.waitTestSuccess() for p in serverProc: p.waitTestSuccess() + +TestUtil.cleanup() diff --git a/py/test/Ice/inheritance/AllTests.py b/py/test/Ice/inheritance/AllTests.py index ccf6f35e645..b83b902f611 100644 --- a/py/test/Ice/inheritance/AllTests.py +++ b/py/test/Ice/inheritance/AllTests.py @@ -15,7 +15,7 @@ def test(b): def allTests(communicator): print "testing stringToProxy... ", - ref = "initial:default -p 12010 -t 10000" + ref = "initial:default -p 12010" base = communicator.stringToProxy(ref) test(base) print "ok" diff --git a/py/test/Ice/inheritance/Collocated.py b/py/test/Ice/inheritance/Collocated.py index 2b4a4e5d614..824d5d83b17 100755 --- a/py/test/Ice/inheritance/Collocated.py +++ b/py/test/Ice/inheritance/Collocated.py @@ -15,7 +15,7 @@ Ice.loadSlice('Test.ice') import Test, TestI, AllTests def run(args, communicator): - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000") + communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010") adapter = communicator.createObjectAdapter("TestAdapter") object = TestI.InitialI(adapter) adapter.add(object, communicator.stringToIdentity("initial")) diff --git a/py/test/Ice/inheritance/Server.py b/py/test/Ice/inheritance/Server.py index 2c1c4290591..27a92387eb5 100755 --- a/py/test/Ice/inheritance/Server.py +++ b/py/test/Ice/inheritance/Server.py @@ -15,7 +15,7 @@ Ice.loadSlice('Test.ice') import Test, TestI def run(args, communicator): - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000") + communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010") adapter = communicator.createObjectAdapter("TestAdapter") object = TestI.InitialI(adapter) adapter.add(object, communicator.stringToIdentity("initial")) diff --git a/py/test/Ice/inheritance/run.py b/py/test/Ice/inheritance/run.py index 545214a74c7..979b91c2544 100755 --- a/py/test/Ice/inheritance/run.py +++ b/py/test/Ice/inheritance/run.py @@ -22,3 +22,5 @@ from scripts import * TestUtil.clientServerTest() TestUtil.collocatedTest() + +TestUtil.cleanup() diff --git a/py/test/Ice/location/Client.py b/py/test/Ice/location/Client.py index 9e12066bed6..ecbd624624c 100755 --- a/py/test/Ice/location/Client.py +++ b/py/test/Ice/location/Client.py @@ -24,7 +24,7 @@ def test(b): raise RuntimeError('test assertion failed') def run(args, communicator): - AllTests.allTests(communicator, "ServerManager:default -p 12010 -t 10000") + AllTests.allTests(communicator, "ServerManager:default -p 12010") return True try: diff --git a/py/test/Ice/location/run.py b/py/test/Ice/location/run.py index bb34e7d35b7..56d48e628de 100755 --- a/py/test/Ice/location/run.py +++ b/py/test/Ice/location/run.py @@ -21,3 +21,5 @@ sys.path.append(os.path.join(path[0])) from scripts import * TestUtil.clientServerTest() + +TestUtil.cleanup() diff --git a/py/test/Ice/objects/AllTests.py b/py/test/Ice/objects/AllTests.py index 0b6812fd949..2f1df30504e 100644 --- a/py/test/Ice/objects/AllTests.py +++ b/py/test/Ice/objects/AllTests.py @@ -55,7 +55,7 @@ def allTests(communicator, collocated): communicator.addObjectFactory(factory, '::Test::H') print "testing stringToProxy...", - ref = "initial:default -p 12010 -t 10000" + ref = "initial:default -p 12010" base = communicator.stringToProxy(ref) test(base) print "ok" @@ -174,7 +174,7 @@ def allTests(communicator, collocated): if not collocated: print "testing UnexpectedObjectException...", - ref = "uoet:default -p 12010 -t 10000" + ref = "uoet:default -p 12010" base = communicator.stringToProxy(ref) test(base) uoet = Test.UnexpectedObjectExceptionTestPrx.uncheckedCast(base) diff --git a/py/test/Ice/objects/Collocated.py b/py/test/Ice/objects/Collocated.py index 0aa2dd2ae8e..30808dcb29e 100755 --- a/py/test/Ice/objects/Collocated.py +++ b/py/test/Ice/objects/Collocated.py @@ -16,7 +16,7 @@ Ice.loadSlice('ClientPrivate.ice') import Test, TestI, AllTests def run(args, communicator): - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000") + communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010") adapter = communicator.createObjectAdapter("TestAdapter") initial = TestI.InitialI(adapter) adapter.add(initial, communicator.stringToIdentity("initial")) diff --git a/py/test/Ice/objects/Server.py b/py/test/Ice/objects/Server.py index 26a577f1ba7..d2b53cde735 100755 --- a/py/test/Ice/objects/Server.py +++ b/py/test/Ice/objects/Server.py @@ -35,7 +35,7 @@ def run(args, communicator): communicator.addObjectFactory(factory, '::Test::J') communicator.addObjectFactory(factory, '::Test::H') - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000") + communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010") adapter = communicator.createObjectAdapter("TestAdapter") initial = TestI.InitialI(adapter) adapter.add(initial, communicator.stringToIdentity("initial")) diff --git a/py/test/Ice/objects/run.py b/py/test/Ice/objects/run.py index 545214a74c7..979b91c2544 100755 --- a/py/test/Ice/objects/run.py +++ b/py/test/Ice/objects/run.py @@ -22,3 +22,5 @@ from scripts import * TestUtil.clientServerTest() TestUtil.collocatedTest() + +TestUtil.cleanup() diff --git a/py/test/Ice/operations/AllTests.py b/py/test/Ice/operations/AllTests.py index 83858d730c1..19152e130e5 100644 --- a/py/test/Ice/operations/AllTests.py +++ b/py/test/Ice/operations/AllTests.py @@ -14,7 +14,7 @@ def test(b): raise RuntimeError('test assertion failed') def allTests(communicator, collocated): - ref = "test:default -p 12010 -t 10000" + ref = "test:default -p 12010" base = communicator.stringToProxy(ref) cl = Test.MyClassPrx.checkedCast(base) derived = Test.MyDerivedClassPrx.checkedCast(cl) diff --git a/py/test/Ice/operations/Collocated.py b/py/test/Ice/operations/Collocated.py index 0b23a944a8b..43a359493c2 100755 --- a/py/test/Ice/operations/Collocated.py +++ b/py/test/Ice/operations/Collocated.py @@ -20,7 +20,7 @@ Ice.loadSlice('-I' + slice_dir + ' Test.ice') import Test, TestI, AllTests def run(args, communicator): - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000") + communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010") adapter = communicator.createObjectAdapter("TestAdapter") adapter.add(TestI.MyDerivedClassI(), communicator.stringToIdentity("test")) adapter.activate() diff --git a/py/test/Ice/operations/Server.py b/py/test/Ice/operations/Server.py index ecee3f2cf27..59e13d97cea 100755 --- a/py/test/Ice/operations/Server.py +++ b/py/test/Ice/operations/Server.py @@ -19,7 +19,7 @@ Ice.loadSlice('-I' + slice_dir + ' Test.ice') import Test, TestI def run(args, communicator): - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp") + communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp") adapter = communicator.createObjectAdapter("TestAdapter") adapter.add(TestI.MyDerivedClassI(), communicator.stringToIdentity("test")) adapter.activate() diff --git a/py/test/Ice/operations/ServerAMD.py b/py/test/Ice/operations/ServerAMD.py index b678605d03a..5d61282bfb5 100755 --- a/py/test/Ice/operations/ServerAMD.py +++ b/py/test/Ice/operations/ServerAMD.py @@ -210,7 +210,7 @@ class MyDerivedClassI(Test.MyDerivedClass): cb.ice_response() def run(args, communicator): - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp") + communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp") adapter = communicator.createObjectAdapter("TestAdapter") adapter.add(MyDerivedClassI(), communicator.stringToIdentity("test")) adapter.activate() diff --git a/py/test/Ice/operations/Twoways.py b/py/test/Ice/operations/Twoways.py index d79bd05243e..a2c96547dd3 100644 --- a/py/test/Ice/operations/Twoways.py +++ b/py/test/Ice/operations/Twoways.py @@ -602,7 +602,7 @@ def twoways(communicator, p): # test(len(p2.opContext()) > 0) # # communicator.setDefaultContext(dflt) - # c = Test.MyClassPrx.checkedCast(communicator.stringToProxy("test:default -p 12010 -t 10000")) + # c = Test.MyClassPrx.checkedCast(communicator.stringToProxy("test:default -p 12010")) # test(c.opContext() == dflt) # # dflt['a'] = 'c' @@ -637,7 +637,7 @@ def twoways(communicator, p): ctx = {'one': 'ONE', 'two': 'TWO', 'three': 'THREE'} - p = Test.MyClassPrx.uncheckedCast(ic.stringToProxy('test:default -p 12010 -t 10000')) + p = Test.MyClassPrx.uncheckedCast(ic.stringToProxy('test:default -p 12010')) ic.getImplicitContext().setContext(ctx) test(ic.getImplicitContext().getContext() == ctx) diff --git a/py/test/Ice/operations/TwowaysAMI.py b/py/test/Ice/operations/TwowaysAMI.py index 295a2051989..b27220ede34 100644 --- a/py/test/Ice/operations/TwowaysAMI.py +++ b/py/test/Ice/operations/TwowaysAMI.py @@ -890,7 +890,7 @@ def twowaysAMI(communicator, p): # test(cb.check()) # # communicator.setDefaultContext(dflt) -# c = Test.MyClassPrx.checkedCast(communicator.stringToProxy("test:default -p 12010 -t 10000")) +# c = Test.MyClassPrx.checkedCast(communicator.stringToProxy("test:default -p 12010")) # cb = AMI_MyClass_opContextEqualI({'a': 'b'}) # c.opContext_async(cb) # test(cb.check()) @@ -934,7 +934,7 @@ def twowaysAMI(communicator, p): ctx = {'one': 'ONE', 'two': 'TWO', 'three': 'THREE'} - p = Test.MyClassPrx.uncheckedCast(ic.stringToProxy("test:default -p 12010 -t 10000")) + p = Test.MyClassPrx.uncheckedCast(ic.stringToProxy("test:default -p 12010")) ic.getImplicitContext().setContext(ctx) test(ic.getImplicitContext().getContext() == ctx) diff --git a/py/test/Ice/operations/run.py b/py/test/Ice/operations/run.py index 8356ffd9740..86c5472a10a 100755 --- a/py/test/Ice/operations/run.py +++ b/py/test/Ice/operations/run.py @@ -26,3 +26,5 @@ print "tests with AMD server." TestUtil.clientServerTest(server="ServerAMD.py") print "tests with collocated server." TestUtil.collocatedTest(" --Ice.ThreadPool.Client.SizeMax=2 --Ice.ThreadPool.Client.SizeWarn=0") + +TestUtil.cleanup() diff --git a/py/test/Ice/proxy/AllTests.py b/py/test/Ice/proxy/AllTests.py index e5b03b4a9e7..25416c68df6 100644 --- a/py/test/Ice/proxy/AllTests.py +++ b/py/test/Ice/proxy/AllTests.py @@ -24,7 +24,7 @@ def allTests(communicator, collocated): p = communicator.propertyToProxy('bogus') test(p == None) - ref = "test:default -p 12010 -t 10000" + ref = "test:default -p 12010" base = communicator.stringToProxy(ref) test(base) @@ -197,7 +197,7 @@ def allTests(communicator, collocated): print "testing propertyToProxy... ", prop = communicator.getProperties() propertyPrefix = "Foo.Proxy" - prop.setProperty(propertyPrefix, "test:default -p 12010 -t 10000") + prop.setProperty(propertyPrefix, "test:default -p 12010") b1 = communicator.propertyToProxy(propertyPrefix) test(b1.ice_getIdentity().name == "test" and len(b1.ice_getIdentity().category) == 0 and \ len(b1.ice_getAdapterId()) == 0 and len(b1.ice_getFacet()) == 0) @@ -239,7 +239,7 @@ def allTests(communicator, collocated): #test(b1.ice_getLocatorCacheTimeout() == 60) #prop.setProperty("Ice.Default.LocatorCacheTimeout", "") - prop.setProperty(propertyPrefix, "test:default -p 12010 -t 10000") + prop.setProperty(propertyPrefix, "test:default -p 12010") property = propertyPrefix + ".Router" test(not b1.ice_getRouter()) diff --git a/py/test/Ice/proxy/Collocated.py b/py/test/Ice/proxy/Collocated.py index 0b23a944a8b..43a359493c2 100755 --- a/py/test/Ice/proxy/Collocated.py +++ b/py/test/Ice/proxy/Collocated.py @@ -20,7 +20,7 @@ Ice.loadSlice('-I' + slice_dir + ' Test.ice') import Test, TestI, AllTests def run(args, communicator): - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000") + communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010") adapter = communicator.createObjectAdapter("TestAdapter") adapter.add(TestI.MyDerivedClassI(), communicator.stringToIdentity("test")) adapter.activate() diff --git a/py/test/Ice/proxy/Server.py b/py/test/Ice/proxy/Server.py index 170fcd80184..9af7dec4acd 100755 --- a/py/test/Ice/proxy/Server.py +++ b/py/test/Ice/proxy/Server.py @@ -20,7 +20,7 @@ Ice.loadSlice('-I' + slice_dir + ' Test.ice') import Test, TestI def run(args, communicator): - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp") + communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp") adapter = communicator.createObjectAdapter("TestAdapter") adapter.add(TestI.MyDerivedClassI(), communicator.stringToIdentity("test")) adapter.activate() diff --git a/py/test/Ice/proxy/ServerAMD.py b/py/test/Ice/proxy/ServerAMD.py index e50f5c63332..93839fe50f3 100755 --- a/py/test/Ice/proxy/ServerAMD.py +++ b/py/test/Ice/proxy/ServerAMD.py @@ -38,7 +38,7 @@ class MyDerivedClassI(Test.MyDerivedClass): return Test.MyDerivedClass.ice_isA(self, s, current) def run(args, communicator): - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp") + communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp") adapter = communicator.createObjectAdapter("TestAdapter") adapter.add(MyDerivedClassI(), communicator.stringToIdentity("test")) adapter.activate() diff --git a/py/test/Ice/proxy/run.py b/py/test/Ice/proxy/run.py index 8356ffd9740..86c5472a10a 100755 --- a/py/test/Ice/proxy/run.py +++ b/py/test/Ice/proxy/run.py @@ -26,3 +26,5 @@ print "tests with AMD server." TestUtil.clientServerTest(server="ServerAMD.py") print "tests with collocated server." TestUtil.collocatedTest(" --Ice.ThreadPool.Client.SizeMax=2 --Ice.ThreadPool.Client.SizeWarn=0") + +TestUtil.cleanup() diff --git a/py/test/Ice/retry/AllTests.py b/py/test/Ice/retry/AllTests.py index 63f329149b5..87a40f80a61 100644 --- a/py/test/Ice/retry/AllTests.py +++ b/py/test/Ice/retry/AllTests.py @@ -60,7 +60,7 @@ class AMIException(CallbackBase): def allTests(communicator): print "testing stringToProxy...", - ref = "retry:default -p 12010 -t 10000" + ref = "retry:default -p 12010" base1 = communicator.stringToProxy(ref) test(base1) base2 = communicator.stringToProxy(ref) diff --git a/py/test/Ice/retry/Server.py b/py/test/Ice/retry/Server.py index ad977b666d5..66b325a1013 100755 --- a/py/test/Ice/retry/Server.py +++ b/py/test/Ice/retry/Server.py @@ -20,7 +20,7 @@ Ice.loadSlice('-I' + slice_dir + ' Test.ice') import Test, TestI def run(args, communicator): - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp") + communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp") adapter = communicator.createObjectAdapter("TestAdapter") id = communicator.stringToIdentity("retry") adapter.add(TestI.RetryI(), id) diff --git a/py/test/Ice/retry/run.py b/py/test/Ice/retry/run.py index bb34e7d35b7..56d48e628de 100755 --- a/py/test/Ice/retry/run.py +++ b/py/test/Ice/retry/run.py @@ -21,3 +21,5 @@ sys.path.append(os.path.join(path[0])) from scripts import * TestUtil.clientServerTest() + +TestUtil.cleanup() diff --git a/py/test/Ice/servantLocator/AllTests.py b/py/test/Ice/servantLocator/AllTests.py index 212c879f2fe..1a9039cf422 100644 --- a/py/test/Ice/servantLocator/AllTests.py +++ b/py/test/Ice/servantLocator/AllTests.py @@ -123,7 +123,7 @@ def testExceptions(obj, collocated): def allTests(communicator, collocated): print "testing stringToProxy...", sys.stdout.flush() - base = communicator.stringToProxy("asm:default -p 12010 -t 10000") + base = communicator.stringToProxy("asm:default -p 12010") test(base) print "ok" @@ -137,7 +137,7 @@ def allTests(communicator, collocated): print "testing ice_ids...", sys.stdout.flush() try: - obj = communicator.stringToProxy("category/locate:default -p 12010 -t 10000") + obj = communicator.stringToProxy("category/locate:default -p 12010") obj.ice_ids() test(False) except Ice.UnknownUserException, ex: @@ -146,7 +146,7 @@ def allTests(communicator, collocated): test(False) try: - obj = communicator.stringToProxy("category/finished:default -p 12010 -t 10000") + obj = communicator.stringToProxy("category/finished:default -p 12010") obj.ice_ids() test(False) except Ice.UnknownUserException, ex: @@ -157,40 +157,40 @@ def allTests(communicator, collocated): print "testing servant locator...", sys.stdout.flush() - base = communicator.stringToProxy("category/locate:default -p 12010 -t 10000") + base = communicator.stringToProxy("category/locate:default -p 12010") obj = Test.TestIntfPrx.checkedCast(base) try: - Test.TestIntfPrx.checkedCast(communicator.stringToProxy("category/unknown:default -p 12010 -t 10000")) + Test.TestIntfPrx.checkedCast(communicator.stringToProxy("category/unknown:default -p 12010")) except Ice.ObjectNotExistException: pass print "ok" print "testing default servant locator...", sys.stdout.flush() - base = communicator.stringToProxy("anothercat/locate:default -p 12010 -t 10000") + base = communicator.stringToProxy("anothercat/locate:default -p 12010") obj = Test.TestIntfPrx.checkedCast(base) - base = communicator.stringToProxy("locate:default -p 12010 -t 10000") + base = communicator.stringToProxy("locate:default -p 12010") obj = Test.TestIntfPrx.checkedCast(base) try: - Test.TestIntfPrx.checkedCast(communicator.stringToProxy("anothercat/unknown:default -p 12010 -t 10000")) + Test.TestIntfPrx.checkedCast(communicator.stringToProxy("anothercat/unknown:default -p 12010")) except Ice.ObjectNotExistException: pass try: - Test.TestIntfPrx.checkedCast(communicator.stringToProxy("unknown:default -p 12010 -t 10000")) + Test.TestIntfPrx.checkedCast(communicator.stringToProxy("unknown:default -p 12010")) except Ice.ObjectNotExistException: pass print "ok" print "testing locate exceptions...", sys.stdout.flush() - base = communicator.stringToProxy("category/locate:default -p 12010 -t 10000") + base = communicator.stringToProxy("category/locate:default -p 12010") obj = Test.TestIntfPrx.checkedCast(base) testExceptions(obj, collocated) print "ok" print "testing finished exceptions...", sys.stdout.flush() - base = communicator.stringToProxy("category/finished:default -p 12010 -t 10000") + base = communicator.stringToProxy("category/finished:default -p 12010") obj = Test.TestIntfPrx.checkedCast(base) testExceptions(obj, collocated) print "ok" diff --git a/py/test/Ice/servantLocator/Collocated.py b/py/test/Ice/servantLocator/Collocated.py index 014d8dac39a..9e996f50732 100755 --- a/py/test/Ice/servantLocator/Collocated.py +++ b/py/test/Ice/servantLocator/Collocated.py @@ -16,7 +16,7 @@ import Test, TestI, AllTests class TestServer(Ice.Application): def run(self, args): - self.communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000") + self.communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010") self.communicator().getProperties().setProperty("Ice.Warn.Dispatch", "0") adapter = self.communicator().createObjectAdapter("TestAdapter") diff --git a/py/test/Ice/servantLocator/Server.py b/py/test/Ice/servantLocator/Server.py index ad1108f64ae..091db0eb4fc 100755 --- a/py/test/Ice/servantLocator/Server.py +++ b/py/test/Ice/servantLocator/Server.py @@ -16,7 +16,7 @@ import Test, TestI class TestServer(Ice.Application): def run(self, args): - self.communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000") + self.communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010") self.communicator().getProperties().setProperty("Ice.Warn.Dispatch", "0") adapter = self.communicator().createObjectAdapter("TestAdapter") diff --git a/py/test/Ice/servantLocator/ServerAMD.py b/py/test/Ice/servantLocator/ServerAMD.py index 3767c1f9579..e322497718f 100755 --- a/py/test/Ice/servantLocator/ServerAMD.py +++ b/py/test/Ice/servantLocator/ServerAMD.py @@ -16,7 +16,7 @@ import Test, TestAMDI class TestServer(Ice.Application): def run(self, args): - self.communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000") + self.communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010") self.communicator().getProperties().setProperty("Ice.Warn.Dispatch", "0") adapter = self.communicator().createObjectAdapter("TestAdapter") diff --git a/py/test/Ice/servantLocator/run.py b/py/test/Ice/servantLocator/run.py index 8356ffd9740..86c5472a10a 100755 --- a/py/test/Ice/servantLocator/run.py +++ b/py/test/Ice/servantLocator/run.py @@ -26,3 +26,5 @@ print "tests with AMD server." TestUtil.clientServerTest(server="ServerAMD.py") print "tests with collocated server." TestUtil.collocatedTest(" --Ice.ThreadPool.Client.SizeMax=2 --Ice.ThreadPool.Client.SizeWarn=0") + +TestUtil.cleanup() diff --git a/py/test/Ice/slicing/exceptions/run.py b/py/test/Ice/slicing/exceptions/run.py index a837100e45f..03ccd381247 100755 --- a/py/test/Ice/slicing/exceptions/run.py +++ b/py/test/Ice/slicing/exceptions/run.py @@ -24,3 +24,5 @@ print "tests with regular server." TestUtil.clientServerTest() print "tests with AMD server." TestUtil.clientServerTest(server="ServerAMD.py") + +TestUtil.cleanup() diff --git a/py/test/Ice/slicing/objects/run.py b/py/test/Ice/slicing/objects/run.py index a837100e45f..03ccd381247 100755 --- a/py/test/Ice/slicing/objects/run.py +++ b/py/test/Ice/slicing/objects/run.py @@ -24,3 +24,5 @@ print "tests with regular server." TestUtil.clientServerTest() print "tests with AMD server." TestUtil.clientServerTest(server="ServerAMD.py") + +TestUtil.cleanup() diff --git a/py/test/Ice/timeout/AllTests.py b/py/test/Ice/timeout/AllTests.py index 6e5601ea007..7150720a524 100644 --- a/py/test/Ice/timeout/AllTests.py +++ b/py/test/Ice/timeout/AllTests.py @@ -62,7 +62,7 @@ class AMISleepEx(CallbackBase): self.called() def allTests(communicator, collocated): - sref = "timeout:default -p 12010 -t 10000" + sref = "timeout:default -p 12010" obj = communicator.stringToProxy(sref) test(obj != None) diff --git a/py/test/Ice/timeout/Server.py b/py/test/Ice/timeout/Server.py index 5868c284f94..791f7af6e89 100755 --- a/py/test/Ice/timeout/Server.py +++ b/py/test/Ice/timeout/Server.py @@ -49,7 +49,7 @@ class TimeoutI(Test.Timeout): current.adapter.getCommunicator().shutdown() def run(args, communicator): - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp") + communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp") adapter = communicator.createObjectAdapter("TestAdapter") adapter.add(TimeoutI(), communicator.stringToIdentity("timeout")) adapter.activate() diff --git a/py/test/Ice/timeout/run.py b/py/test/Ice/timeout/run.py index bb34e7d35b7..56d48e628de 100755 --- a/py/test/Ice/timeout/run.py +++ b/py/test/Ice/timeout/run.py @@ -21,3 +21,5 @@ sys.path.append(os.path.join(path[0])) from scripts import * TestUtil.clientServerTest() + +TestUtil.cleanup() diff --git a/py/test/Slice/keyword/Client.py b/py/test/Slice/keyword/Client.py index 97d9c4cb81d..61b2b1ab229 100755 --- a/py/test/Slice/keyword/Client.py +++ b/py/test/Slice/keyword/Client.py @@ -76,7 +76,7 @@ def testtypes(): print "ok" def run(args, communicator): - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp") + communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp") adapter = communicator.createObjectAdapter("TestAdapter") adapter.add(execI(), communicator.stringToIdentity("test")) adapter.activate() diff --git a/py/test/Slice/keyword/run.py b/py/test/Slice/keyword/run.py index 6722947e90c..1e5f898cd6c 100755 --- a/py/test/Slice/keyword/run.py +++ b/py/test/Slice/keyword/run.py @@ -25,3 +25,5 @@ clientProc = TestUtil.startClient("Client.py", "--Ice.Default.Host=127.0.0.1", s print "ok" clientProc.startReader() clientProc.waitTestSuccess() + +TestUtil.cleanup() diff --git a/rb/test/Ice/binding/AllTests.rb b/rb/test/Ice/binding/AllTests.rb index 2f5a52119c8..ef48e2ce580 100644 --- a/rb/test/Ice/binding/AllTests.rb +++ b/rb/test/Ice/binding/AllTests.rb @@ -31,7 +31,7 @@ def deactivate(com, adapters) end def allTests(communicator) - ref = "communicator:default -p 12010 -t 10000" + ref = "communicator:default -p 12010" com = Test::RemoteCommunicatorPrx::uncheckedCast(communicator.stringToProxy(ref)) print "testing binding with single endpoint... " diff --git a/rb/test/Ice/binding/run.py b/rb/test/Ice/binding/run.py index bb34e7d35b7..56d48e628de 100755 --- a/rb/test/Ice/binding/run.py +++ b/rb/test/Ice/binding/run.py @@ -21,3 +21,5 @@ sys.path.append(os.path.join(path[0])) from scripts import * TestUtil.clientServerTest() + +TestUtil.cleanup() diff --git a/rb/test/Ice/checksum/AllTests.rb b/rb/test/Ice/checksum/AllTests.rb index b7bc43d1245..2dcb9a7416a 100644 --- a/rb/test/Ice/checksum/AllTests.rb +++ b/rb/test/Ice/checksum/AllTests.rb @@ -14,7 +14,7 @@ def test(b) end def allTests(communicator) - ref = "test:default -p 12010 -t 10000" + ref = "test:default -p 12010" base = communicator.stringToProxy(ref) test(base) diff --git a/rb/test/Ice/checksum/run.py b/rb/test/Ice/checksum/run.py index 0c61d630452..0e1d22c8b58 100755 --- a/rb/test/Ice/checksum/run.py +++ b/rb/test/Ice/checksum/run.py @@ -21,3 +21,5 @@ sys.path.append(os.path.join(path[0])) from scripts import * TestUtil.clientServerTest(server='server/server') + +TestUtil.cleanup() diff --git a/rb/test/Ice/exceptions/AllTests.rb b/rb/test/Ice/exceptions/AllTests.rb index 03cc1965e96..59db64be2ec 100644 --- a/rb/test/Ice/exceptions/AllTests.rb +++ b/rb/test/Ice/exceptions/AllTests.rb @@ -42,7 +42,7 @@ def allTests(communicator) print "testing stringToProxy... " STDOUT.flush - ref = "thrower:default -p 12010 -t 10000" + ref = "thrower:default -p 12010" base = communicator.stringToProxy(ref) test(base) puts "ok" diff --git a/rb/test/Ice/exceptions/run.py b/rb/test/Ice/exceptions/run.py index a8cd68361bf..31d2df0dba4 100755 --- a/rb/test/Ice/exceptions/run.py +++ b/rb/test/Ice/exceptions/run.py @@ -24,4 +24,6 @@ print "tests with regular server." TestUtil.clientServerTest() print "tests with AMD server." TestUtil.clientServerTest(server="serveramd") + +TestUtil.cleanup() sys.exit(0) diff --git a/rb/test/Ice/facets/AllTests.rb b/rb/test/Ice/facets/AllTests.rb index ae8fab84bd3..8664ef65245 100644 --- a/rb/test/Ice/facets/AllTests.rb +++ b/rb/test/Ice/facets/AllTests.rb @@ -38,7 +38,7 @@ def allTests(communicator) print "testing stringToProxy... " STDOUT.flush - ref = "d:default -p 12010 -t 10000" + ref = "d:default -p 12010" db = communicator.stringToProxy(ref) test(db) puts "ok" diff --git a/rb/test/Ice/facets/run.py b/rb/test/Ice/facets/run.py index bb34e7d35b7..56d48e628de 100755 --- a/rb/test/Ice/facets/run.py +++ b/rb/test/Ice/facets/run.py @@ -21,3 +21,5 @@ sys.path.append(os.path.join(path[0])) from scripts import * TestUtil.clientServerTest() + +TestUtil.cleanup() diff --git a/rb/test/Ice/inheritance/AllTests.rb b/rb/test/Ice/inheritance/AllTests.rb index 86c9339a06d..d47ab689aaa 100644 --- a/rb/test/Ice/inheritance/AllTests.rb +++ b/rb/test/Ice/inheritance/AllTests.rb @@ -16,7 +16,7 @@ end def allTests(communicator) print "testing stringToProxy... " STDOUT.flush - ref = "initial:default -p 12010 -t 10000" + ref = "initial:default -p 12010" base = communicator.stringToProxy(ref) test(base) puts "ok" diff --git a/rb/test/Ice/inheritance/run.py b/rb/test/Ice/inheritance/run.py index bb34e7d35b7..56d48e628de 100755 --- a/rb/test/Ice/inheritance/run.py +++ b/rb/test/Ice/inheritance/run.py @@ -21,3 +21,5 @@ sys.path.append(os.path.join(path[0])) from scripts import * TestUtil.clientServerTest() + +TestUtil.cleanup() diff --git a/rb/test/Ice/location/Client.rb b/rb/test/Ice/location/Client.rb index fa10dc88f33..86c717b1045 100755 --- a/rb/test/Ice/location/Client.rb +++ b/rb/test/Ice/location/Client.rb @@ -20,7 +20,7 @@ Ice::loadSlice('-I' + slice_dir + ' Test.ice') require 'AllTests' def run(args, communicator) - allTests(communicator, "ServerManager:default -p 12010 -t 10000") + allTests(communicator, "ServerManager:default -p 12010") return true end diff --git a/rb/test/Ice/location/run.py b/rb/test/Ice/location/run.py index bb34e7d35b7..56d48e628de 100755 --- a/rb/test/Ice/location/run.py +++ b/rb/test/Ice/location/run.py @@ -21,3 +21,5 @@ sys.path.append(os.path.join(path[0])) from scripts import * TestUtil.clientServerTest() + +TestUtil.cleanup() diff --git a/rb/test/Ice/objects/AllTests.rb b/rb/test/Ice/objects/AllTests.rb index 99a42486486..59c48fa1aeb 100644 --- a/rb/test/Ice/objects/AllTests.rb +++ b/rb/test/Ice/objects/AllTests.rb @@ -57,7 +57,7 @@ def allTests(communicator) print "testing stringToProxy... " STDOUT.flush - ref = "initial:default -p 12010 -t 10000" + ref = "initial:default -p 12010" base = communicator.stringToProxy(ref) test(base) puts "ok" @@ -202,7 +202,7 @@ def allTests(communicator) print "testing UnexpectedObjectException... " STDOUT.flush - ref = "uoet:default -p 12010 -t 10000" + ref = "uoet:default -p 12010" base = communicator.stringToProxy(ref) test(base) uoet = Test::UnexpectedObjectExceptionTestPrx::uncheckedCast(base) diff --git a/rb/test/Ice/objects/run.py b/rb/test/Ice/objects/run.py index bb34e7d35b7..56d48e628de 100755 --- a/rb/test/Ice/objects/run.py +++ b/rb/test/Ice/objects/run.py @@ -21,3 +21,5 @@ sys.path.append(os.path.join(path[0])) from scripts import * TestUtil.clientServerTest() + +TestUtil.cleanup() diff --git a/rb/test/Ice/operations/AllTests.rb b/rb/test/Ice/operations/AllTests.rb index a450d1491d7..089d107a859 100644 --- a/rb/test/Ice/operations/AllTests.rb +++ b/rb/test/Ice/operations/AllTests.rb @@ -11,7 +11,7 @@ require 'Twoways' require 'BatchOneways' def allTests(communicator) - ref = "test:default -p 12010 -t 10000" + ref = "test:default -p 12010" base = communicator.stringToProxy(ref) cl = Test::MyClassPrx::checkedCast(base) derived = Test::MyDerivedClassPrx::checkedCast(cl) diff --git a/rb/test/Ice/operations/Twoways.rb b/rb/test/Ice/operations/Twoways.rb index 2839d39f6ea..66a337b85bd 100644 --- a/rb/test/Ice/operations/Twoways.rb +++ b/rb/test/Ice/operations/Twoways.rb @@ -499,7 +499,7 @@ def twoways(communicator, p) # test(p2.opContext().length > 0) # # communicator.setDefaultContext(dflt) -# c = Test::MyClassPrx::checkedCast(communicator.stringToProxy("test:default -p 12010 -t 10000")) +# c = Test::MyClassPrx::checkedCast(communicator.stringToProxy("test:default -p 12010")) # test(c.opContext() == dflt) # # dflt['a'] = 'c' @@ -534,7 +534,7 @@ def twoways(communicator, p) ctx = {'one'=>'ONE', 'two'=>'TWO', 'three'=>'THREE'} - p = Test::MyClassPrx::uncheckedCast(ic.stringToProxy('test:default -p 12010 -t 10000')) + p = Test::MyClassPrx::uncheckedCast(ic.stringToProxy('test:default -p 12010')) ic.getImplicitContext().setContext(ctx) test(ic.getImplicitContext().getContext() == ctx) diff --git a/rb/test/Ice/operations/run.py b/rb/test/Ice/operations/run.py index 76e256c3c6a..26f9f4f7a9e 100755 --- a/rb/test/Ice/operations/run.py +++ b/rb/test/Ice/operations/run.py @@ -24,3 +24,5 @@ print "tests with regular server." TestUtil.clientServerTest() print "tests with AMD server." TestUtil.clientServerTest(server="serveramd") + +TestUtil.cleanup() diff --git a/rb/test/Ice/proxy/AllTests.rb b/rb/test/Ice/proxy/AllTests.rb index d687bf15f7d..5b2909596c3 100644 --- a/rb/test/Ice/proxy/AllTests.rb +++ b/rb/test/Ice/proxy/AllTests.rb @@ -10,7 +10,7 @@ def allTests(communicator) print "testing stringToProxy... " STDOUT.flush - ref = "test:default -p 12010 -t 10000" + ref = "test:default -p 12010" base = communicator.stringToProxy(ref) test(base) @@ -184,7 +184,7 @@ def allTests(communicator) STDOUT.flush prop = communicator.getProperties() propertyPrefix = "Foo.Proxy" - prop.setProperty(propertyPrefix, "test:default -p 12010 -t 10000") + prop.setProperty(propertyPrefix, "test:default -p 12010") b1 = communicator.propertyToProxy(propertyPrefix) test(b1.ice_getIdentity().name == "test" && b1.ice_getIdentity().category.empty? && \ b1.ice_getAdapterId().empty? && b1.ice_getFacet().empty?) @@ -226,7 +226,7 @@ def allTests(communicator) #test(b1.ice_getLocatorCacheTimeout() == 60) #prop.setProperty("Ice::Default.LocatorCacheTimeout", "") - prop.setProperty(propertyPrefix, "test:default -p 12010 -t 10000") + prop.setProperty(propertyPrefix, "test:default -p 12010") property = propertyPrefix + ".Router" test(!b1.ice_getRouter()) diff --git a/rb/test/Ice/proxy/run.py b/rb/test/Ice/proxy/run.py index a8cd68361bf..31d2df0dba4 100755 --- a/rb/test/Ice/proxy/run.py +++ b/rb/test/Ice/proxy/run.py @@ -24,4 +24,6 @@ print "tests with regular server." TestUtil.clientServerTest() print "tests with AMD server." TestUtil.clientServerTest(server="serveramd") + +TestUtil.cleanup() sys.exit(0) diff --git a/rb/test/Ice/retry/run.py b/rb/test/Ice/retry/run.py index bb34e7d35b7..56d48e628de 100755 --- a/rb/test/Ice/retry/run.py +++ b/rb/test/Ice/retry/run.py @@ -21,3 +21,5 @@ sys.path.append(os.path.join(path[0])) from scripts import * TestUtil.clientServerTest() + +TestUtil.cleanup() diff --git a/rb/test/Ice/slicing/exceptions/run.py b/rb/test/Ice/slicing/exceptions/run.py index b85e4a1a4b3..f16ed7e4a05 100755 --- a/rb/test/Ice/slicing/exceptions/run.py +++ b/rb/test/Ice/slicing/exceptions/run.py @@ -21,3 +21,5 @@ sys.path.append(os.path.join(path[0])) from scripts import * TestUtil.clientServerTest() + +TestUtil.cleanup() diff --git a/rb/test/Ice/slicing/objects/run.py b/rb/test/Ice/slicing/objects/run.py index b85e4a1a4b3..f16ed7e4a05 100755 --- a/rb/test/Ice/slicing/objects/run.py +++ b/rb/test/Ice/slicing/objects/run.py @@ -21,3 +21,5 @@ sys.path.append(os.path.join(path[0])) from scripts import * TestUtil.clientServerTest() + +TestUtil.cleanup() diff --git a/rb/test/Ice/timeout/AllTests.rb b/rb/test/Ice/timeout/AllTests.rb index 5afae79e534..ddb5f43917b 100644 --- a/rb/test/Ice/timeout/AllTests.rb +++ b/rb/test/Ice/timeout/AllTests.rb @@ -8,7 +8,7 @@ # ********************************************************************** def allTests(communicator) - sref = "timeout:default -p 12010 -t 10000" + sref = "timeout:default -p 12010" obj = communicator.stringToProxy(sref) test(obj) diff --git a/rb/test/Ice/timeout/run.py b/rb/test/Ice/timeout/run.py index 633a528fb24..adf577c233c 100755 --- a/rb/test/Ice/timeout/run.py +++ b/rb/test/Ice/timeout/run.py @@ -22,3 +22,5 @@ from scripts import * print "tests with regular server." TestUtil.clientServerTest() + +TestUtil.cleanup() diff --git a/rb/test/Slice/keyword/run.py b/rb/test/Slice/keyword/run.py index 3c1ac708e59..01452365190 100755 --- a/rb/test/Slice/keyword/run.py +++ b/rb/test/Slice/keyword/run.py @@ -25,3 +25,5 @@ clientProc = TestUtil.startClient("Client.rb", "--Ice.Default.Host=127.0.0.1", s print "ok" clientProc.startReader() clientProc.waitTestSuccess() + +TestUtil.cleanup() diff --git a/scripts/IceGridAdmin.py b/scripts/IceGridAdmin.py index efb2e2a97c9..85f93226545 100644 --- a/scripts/IceGridAdmin.py +++ b/scripts/IceGridAdmin.py @@ -94,7 +94,7 @@ def startIceGridRegistry(testdir, dynamicRegistration = False): print "starting icegrid " + name + "...", cmd = command + \ r' --Ice.ProgramName=' + name + \ - r' --IceGrid.Registry.Client.Endpoints="default -p ' + str(iceGridPort + i) + ' -t 30000" ' + \ + r' --IceGrid.Registry.Client.Endpoints="default -p ' + str(iceGridPort + i) + '" ' + \ r' --IceGrid.Registry.Data=' + dataDir if i > 0: diff --git a/scripts/IceStormUtil.py b/scripts/IceStormUtil.py index 19d27e818be..a81894faade 100644 --- a/scripts/IceStormUtil.py +++ b/scripts/IceStormUtil.py @@ -81,7 +81,7 @@ class Replicated(IceStormUtil): replicaPublishEndpoints = '' for replica in range(0, 3): replicaProperties = replicaProperties + \ - ' --IceStorm.Nodes.%d="%s/node%d:default -p %d -t 1000"' % ( + ' --IceStorm.Nodes.%d="%s/node%d:default -p %d"' % ( replica, instanceName, replica, self.nendpoints[replica]) replicaTopicManagerEndpoints = replicaTopicManagerEndpoints + "%sdefault -p %d" % ( sep, self.isendpoints[replica]) diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index 21aed24e2b8..69eeffb34a6 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -7,8 +7,7 @@ # # ********************************************************************** -import sys, os, re, errno, getopt, time, StringIO, string, copy -from threading import Thread +import sys, os, re, errno, getopt, time, StringIO, string, copy, threading, signal # Global flags and their default values. protocol = "" # If unset, default to TCP. Valid values are "tcp" or "ssl". @@ -27,6 +26,7 @@ valgrind = False # Set to True to use valgrind for C++ executable tracefile = None printenv = False cross = [] +watchDog = None def isCygwin(): # The substring on sys.platform is required because some cygwin @@ -698,7 +698,7 @@ def getCommandLine(exe, config): components.append("--Ice.ThreadPool.Server.Size=1 --Ice.ThreadPool.Server.SizeMax=3 --Ice.ThreadPool.Server.SizeWarn=0") if config.type == "server": - components.append("--Ice.PrintAdapterReady=1 --Ice.ServerIdleTime=30") + components.append("--Ice.PrintAdapterReady=1") if config.ipv6: components.append("--Ice.Default.Host=0:0:0:0:0:0:0:1 --Ice.IPv6=1") @@ -810,6 +810,13 @@ def isDebug(): import Expect def spawn(cmd, env = None, cwd = None, startReader = True,lang=None): + # Start/Reset the watch dog thread + global watchDog + if watchDog == None: + watchDog = WatchDog() + else: + watchDog.reset() + if debug: print "(%s)" % cmd, if printenv: @@ -1016,6 +1023,61 @@ def getTestName(): # The crossTests list is in UNIX format. return os.path.join(*here).replace(os.sep, '/') +class WatchDog(threading.Thread): + def __init__(self): + self._done = False + self._reset = False + self._cv = threading.Condition() + threading.Thread.__init__(self) + + # + # Setup and install signal handlers + # + if signal.__dict__.has_key('SIGHUP'): + signal.signal(signal.SIGHUP, signal.SIG_DFL) + if signal.__dict__.has_key('SIGBREAK'): + signal.signal(signal.SIGBREAK, signal.SIG_DFL) + signal.signal(signal.SIGINT, signal.SIG_DFL) + signal.signal(signal.SIGTERM, signal.SIG_DFL) + + self.start() + + def run(self): + self._cv.acquire() + while self._done == False: + self._cv.wait(180) + if self._reset: + self._reset = False + elif not self._done: + print "\a*** %s Warning: Test has been inactive for 3 minutes and may be hung", time.strftime("%x %X") + somecrap + self._cv.release() + + def reset(self): + self._cv.acquire() + self._reset = True + self._cv.notify() + self._cv.release() + + def destroy(self): + self._cv.acquire() + self._done = True + self._cv.notify() + self._cv.release() + + def signalHandler(self, sig, frame): + self.destroy() + self.join() + signalHandler = classmethod(signalHandler) + +def cleanup(): + # Stop watch dog thread + global watchDog + if watchDog != None: + watchDog.destroy() + watchDog.join() + watchDog = None + def processCmdLine(): def usage(): print "usage: " + sys.argv[0] + """ @@ -1230,7 +1292,6 @@ def runTests(start, expanded, num = 0, script = False): global testErrors testErrors.append(message) - if os.environ.has_key("ICE_CONFIG"): os.unsetenv("ICE_CONFIG") |