Fixed timeout tests to be less time sensitive

The tests now use a controller to hold/activate the adapter instead of relying
on a timer. Fixes ICE-8312.

1 files changed, 7 insertions, 0 deletions

diff --git a/csharp/test/Ice/timeout/Server.cs b/csharp/test/Ice/timeout/Server.cs
index 1db43419a87..9cb24c03566 100644
--- a/csharp/test/Ice/timeout/Server.cs
+++ b/csharp/test/Ice/timeout/Server.cs
@@ -21,10 +21,17 @@ public class Server : TestCommon.Application
     public override int run(string[] args)
     {
         communicator().getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0));
+        communicator().getProperties().setProperty("ControllerAdapter.Endpoints", getTestEndpoint(1));
+        communicator().getProperties().setProperty("ControllerAdapter.ThreadPool.Size", "1");
+
         Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
         adapter.add(new TimeoutI(), Ice.Util.stringToIdentity("timeout"));
         adapter.activate();
 
+        Ice.ObjectAdapter controllerAdapter = communicator().createObjectAdapter("ControllerAdapter");
+        controllerAdapter.add(new ControllerI(adapter), Ice.Util.stringToIdentity("controller"));
+        controllerAdapter.activate();
+
         communicator().waitForShutdown();
         return 0;
     }