4 files changed, 10 insertions, 5 deletions
diff --git a/cpp/config/TestUtil.py b/cpp/config/TestUtil.py
index 270ab373090..0c1b16d3c44 100644
--- a/cpp/config/TestUtil.py
+++ b/cpp/config/TestUtil.py
@@ -207,7 +207,7 @@ else:
 commonClientOptions = " --Ice.NullHandleAbort --Ice.Warn.Connections"
 
 commonServerOptions = " --Ice.PrintProcessId --Ice.PrintAdapterReady --Ice.NullHandleAbort" + \
-                      " --Ice.Warn.Connections --Ice.ServerIdleTime=120" + \
+                      " --Ice.Warn.Connections --Ice.ServerIdleTime=30" + \
                       " --Ice.ThreadPool.Server.Size=1 --Ice.ThreadPool.Server.SizeMax=3" + \
                       " --Ice.ThreadPool.Server.SizeWarn=0"
 
diff --git a/cpp/test/Ice/faultTolerance/Server.cpp b/cpp/test/Ice/faultTolerance/Server.cpp
index c2fc89ef537..2e9ed221516 100644
--- a/cpp/test/Ice/faultTolerance/Server.cpp
+++ b/cpp/test/Ice/faultTolerance/Server.cpp
@@ -72,9 +72,16 @@ main(int argc, char* argv[])
 
     try
     {
+        //
+	// In this test, we need a longer server idle time, otherwise
+	// our test servers may time out before they are used in the
+	// test.
+	//
+	Ice::PropertiesPtr properties = Ice::getDefaultProperties(argc, argv);
+	properties->setProperty("Ice.ServerIdleTime", "120"); // Two minutes.
+
 	communicator = Ice::initialize(argc, argv);
 	status = run(argc, argv, communicator);
-
     }
     catch(const Ice::Exception& ex)
     {
diff --git a/cpp/test/Ice/operations/Client.cpp b/cpp/test/Ice/operations/Client.cpp
index 5889289248e..70851d9d94c 100644
--- a/cpp/test/Ice/operations/Client.cpp
+++ b/cpp/test/Ice/operations/Client.cpp
@@ -47,12 +47,11 @@ main(int argc, char* argv[])
 
     try
     {
-	Ice::PropertiesPtr properties = Ice::getDefaultProperties(argc, argv);
-
 	//
 	// In this test, we need at least two threads in the
 	// client side thread pool for nested AMI.
 	//
+	Ice::PropertiesPtr properties = Ice::getDefaultProperties(argc, argv);
 	properties->setProperty("Ice.ThreadPool.Client.Size", "2");
 	properties->setProperty("Ice.ThreadPool.Client.SizeWarn", "0");
 
diff --git a/cpp/test/Ice/operations/Server.cpp b/cpp/test/Ice/operations/Server.cpp
index 8c53f3ff1ed..116c1a82acf 100644
--- a/cpp/test/Ice/operations/Server.cpp
+++ b/cpp/test/Ice/operations/Server.cpp
@@ -39,7 +39,6 @@ main(int argc, char* argv[])
     {
 	communicator = Ice::initialize(argc, argv);
 	status = run(argc, argv, communicator);
-
     }
     catch(const Ice::Exception& ex)
     {