Update Glacier2 base port to avoid conflicts with selenium driver

20 files changed, 53 insertions, 53 deletions

diff --git a/cpp/test/Glacier2/application/Client.cpp b/cpp/test/Glacier2/application/Client.cpp
index 155379a9969..eaf7574bb16 100644
--- a/cpp/test/Glacier2/application/Client.cpp
+++ b/cpp/test/Glacier2/application/Client.cpp
@@ -120,14 +120,14 @@ main(int argc, char* argv[])
     Application app;
     Ice::InitializationData initData = getTestInitData(argc, argv);
     initData.properties->setProperty("Ice.Warn.Connections", "0");
-    initData.properties->setProperty("Ice.Default.Router", "Glacier2/router:" + getTestEndpoint(initData.properties, 10));
+    initData.properties->setProperty("Ice.Default.Router", "Glacier2/router:" + getTestEndpoint(initData.properties, 50));
     int status = app.main(argc, argv, initData);
 
     initData.properties->setProperty("Ice.Default.Router", "");
     Ice::CommunicatorPtr communicator = Ice::initialize(initData);
 
     cout << "testing stringToProxy for process object... " << flush;
-    Ice::ObjectPrxPtr processBase = communicator->stringToProxy("Glacier2/admin -f Process:" + getTestEndpoint(communicator, 11));
+    Ice::ObjectPrxPtr processBase = communicator->stringToProxy("Glacier2/admin -f Process:" + getTestEndpoint(communicator, 51));
     cout << "ok" << endl;
 
     cout << "testing checked cast for admin object... " << flush;
diff --git a/cpp/test/Glacier2/attack/Client.cpp b/cpp/test/Glacier2/attack/Client.cpp
index c931257ff8d..2420e580cd3 100644
--- a/cpp/test/Glacier2/attack/Client.cpp
+++ b/cpp/test/Glacier2/attack/Client.cpp
@@ -44,7 +44,7 @@ int
 AttackClient::run(int, char**)
 {
     cout << "getting router... " << flush;
-    ObjectPrx routerBase = communicator()->stringToProxy("Glacier2/router:" + getTestEndpoint(communicator(), 10));
+    ObjectPrx routerBase = communicator()->stringToProxy("Glacier2/router:" + getTestEndpoint(communicator(), 50));
     Glacier2::RouterPrx router = Glacier2::RouterPrx::checkedCast(routerBase);
     test(router);
     communicator()->setDefaultRouter(router);
@@ -114,7 +114,7 @@ AttackClient::run(int, char**)
     backend->shutdown();
     communicator()->setDefaultRouter(0);
     ObjectPrx adminBase = communicator()->stringToProxy("Glacier2/admin -f Process:" +
-                                                        getTestEndpoint(communicator(), 11));
+                                                        getTestEndpoint(communicator(), 51));
     Ice::ProcessPrx process = Ice::ProcessPrx::checkedCast(adminBase);
     test(process);
     process->shutdown();
diff --git a/cpp/test/Glacier2/dynamicFiltering/Client.cpp b/cpp/test/Glacier2/dynamicFiltering/Client.cpp
index 1fdfbd241fe..45589aa82a3 100644
--- a/cpp/test/Glacier2/dynamicFiltering/Client.cpp
+++ b/cpp/test/Glacier2/dynamicFiltering/Client.cpp
@@ -65,7 +65,7 @@ SessionControlClient::run(int argc, char* argv[])
     cout << "ok" << endl;
 
     cout << "getting router... " << flush;
-    ObjectPrx routerBase = communicator()->stringToProxy("Glacier2/router:" + getTestEndpoint(communicator(), 10));
+    ObjectPrx routerBase = communicator()->stringToProxy("Glacier2/router:" + getTestEndpoint(communicator(), 50));
     Glacier2::RouterPrx router = Glacier2::RouterPrx::checkedCast(routerBase);
     test(router);
     communicator()->setDefaultRouter(router);
@@ -160,7 +160,7 @@ SessionControlClient::run(int argc, char* argv[])
     //
     communicator()->setDefaultRouter(0);
     ObjectPrx processBase = communicator()->stringToProxy("Glacier2/admin -f Process:" +
-                                                          getTestEndpoint(communicator(), 11));
+                                                          getTestEndpoint(communicator(), 51));
     Ice::ProcessPrx process = Ice::ProcessPrx::checkedCast(processBase);
     test(process);
     process->shutdown();
diff --git a/cpp/test/Glacier2/override/Client.cpp b/cpp/test/Glacier2/override/Client.cpp
index 5e1c35f35c4..67e337b51d5 100644
--- a/cpp/test/Glacier2/override/Client.cpp
+++ b/cpp/test/Glacier2/override/Client.cpp
@@ -43,7 +43,7 @@ main(int argc, char* argv[])
 int
 CallbackClient::run(int, char**)
 {
-    ObjectPrx routerBase = communicator()->stringToProxy("Glacier2/router:" + getTestEndpoint(communicator(), 10));
+    ObjectPrx routerBase = communicator()->stringToProxy("Glacier2/router:" + getTestEndpoint(communicator(), 50));
     Glacier2::RouterPrx router = Glacier2::RouterPrx::checkedCast(routerBase);
     communicator()->setDefaultRouter(router);
 
@@ -207,7 +207,7 @@ CallbackClient::run(int, char**)
 
         communicator()->setDefaultRouter(0);
         ObjectPrx processBase = communicator()->stringToProxy("Glacier2/admin -f Process:" +
-                                                              getTestEndpoint(communicator(), 11));
+                                                              getTestEndpoint(communicator(), 51));
         Ice::ProcessPrx process = Ice::ProcessPrx::checkedCast(processBase);
         process->shutdown();
         try
diff --git a/cpp/test/Glacier2/router/Client.cpp b/cpp/test/Glacier2/router/Client.cpp
index 5a38b1ae193..778e02ea4ea 100644
--- a/cpp/test/Glacier2/router/Client.cpp
+++ b/cpp/test/Glacier2/router/Client.cpp
@@ -82,7 +82,7 @@ public:
     void run()
     {
         CommunicatorPtr communicator = initialize(initData);
-        ObjectPrx routerBase = communicator->stringToProxy("Glacier2/router:" + getTestEndpoint(communicator, 10));
+        ObjectPrx routerBase = communicator->stringToProxy("Glacier2/router:" + getTestEndpoint(communicator, 50));
         Glacier2::RouterPrx router = Glacier2::RouterPrx::checkedCast(routerBase);
         communicator->setDefaultRouter(router);
 
@@ -188,7 +188,7 @@ public:
     void run()
     {
         CommunicatorPtr communicator = initialize(initData);
-        ObjectPrx routerBase = communicator->stringToProxy("Glacier2/router:" + getTestEndpoint(communicator, 10));
+        ObjectPrx routerBase = communicator->stringToProxy("Glacier2/router:" + getTestEndpoint(communicator, 50));
         _router = Glacier2::RouterPrx::checkedCast(routerBase);
         communicator->setDefaultRouter(_router);
 
@@ -437,7 +437,7 @@ CallbackClient::run(int argc, char* argv[])
 
     {
         cout << "testing stringToProxy for router... " << flush;
-        routerBase = communicator()->stringToProxy("Glacier2/router:" + getTestEndpoint(communicator(), 10));
+        routerBase = communicator()->stringToProxy("Glacier2/router:" + getTestEndpoint(communicator(), 50));
         cout << "ok" << endl;
     }
 
@@ -454,7 +454,7 @@ CallbackClient::run(int argc, char* argv[])
         cout << "testing router finder... " << flush;
         Ice::RouterFinderPrx finder =
             RouterFinderPrx::uncheckedCast(communicator()->stringToProxy("Ice/RouterFinder:" +
-                                                                         getTestEndpoint(communicator(), 10)));
+                                                                         getTestEndpoint(communicator(), 50)));
         test(finder->getRouter()->ice_getIdentity() == router->ice_getIdentity());
         cout << "ok" << endl;
     }
@@ -906,7 +906,7 @@ CallbackClient::run(int argc, char* argv[])
         {
             cout << "testing stringToProxy for admin process facet... " << flush;
             processBase = communicator()->stringToProxy("Glacier2/admin -f Process:" +
-                                                        getTestEndpoint(communicator(), 11));
+                                                        getTestEndpoint(communicator(), 51));
             cout << "ok" << endl;
         }
 
diff --git a/cpp/test/Glacier2/sessionControl/Client.cpp b/cpp/test/Glacier2/sessionControl/Client.cpp
index c4a43b89574..c0dd7c01a72 100644
--- a/cpp/test/Glacier2/sessionControl/Client.cpp
+++ b/cpp/test/Glacier2/sessionControl/Client.cpp
@@ -44,7 +44,7 @@ int
 SessionControlClient::run(int, char**)
 {
     cout << "getting router... " << flush;
-    ObjectPrx routerBase = communicator()->stringToProxy("Glacier2/router:" + getTestEndpoint(communicator(), 10));
+    ObjectPrx routerBase = communicator()->stringToProxy("Glacier2/router:" + getTestEndpoint(communicator(), 50));
     Glacier2::RouterPrx router = Glacier2::RouterPrx::checkedCast(routerBase);
     test(router);
     communicator()->setDefaultRouter(router);
@@ -99,7 +99,7 @@ SessionControlClient::run(int, char**)
     session->shutdown();
     communicator()->setDefaultRouter(0);
     ObjectPrx processBase = communicator()->stringToProxy("Glacier2/admin -f Process:" +
-                                                          getTestEndpoint(communicator(), 11));
+                                                          getTestEndpoint(communicator(), 51));
     Ice::ProcessPrx process = Ice::ProcessPrx::checkedCast(processBase);
     test(process);
     process->shutdown();
diff --git a/cpp/test/Glacier2/sessionHelper/Client.cpp b/cpp/test/Glacier2/sessionHelper/Client.cpp
index a6485f282ef..a1a296e87be 100644
--- a/cpp/test/Glacier2/sessionHelper/Client.cpp
+++ b/cpp/test/Glacier2/sessionHelper/Client.cpp
@@ -305,7 +305,7 @@ public:
         string host = getTestHost(communicator()->getProperties());
         _initData.properties = Ice::createProperties(argc, argv, communicator()->getProperties());
         _initData.properties->setProperty("Ice.Default.Router", "Glacier2/router:" +
-                                          getTestEndpoint(communicator(), 10));
+                                          getTestEndpoint(communicator(), 50));
 
         DispatcherPtr dispatcher = new Dispatcher();
         dispatcher->start();
@@ -370,7 +370,7 @@ public:
             IceUtil::Monitor<IceUtil::Mutex>::Lock lock(_monitor);
             cout << "testing SessionHelper connect... " << flush;
             _factory->setRouterHost(host);
-            _factory->setPort(getTestPort(_initData.properties, 10));
+            _factory->setPort(getTestPort(_initData.properties, 50));
             _factory->setProtocol(protocol);
             _session = _factory->connect("userid", "abc123");
 
@@ -469,7 +469,7 @@ public:
             {
                 cout << "testing stringToProxy for process object... " << flush;
                 processBase = communicator()->stringToProxy("Glacier2/admin -f Process:" +
-                                                            getTestEndpoint(communicator(), 11));
+                                                            getTestEndpoint(communicator(), 51));
                 cout << "ok" << endl;
             }
 
@@ -507,7 +507,7 @@ public:
             IceUtil::Monitor<IceUtil::Mutex>::Lock lock(_monitor);
             cout << "testing SessionHelper connect after router shutdown... " << flush;
             _factory->setRouterHost(host);
-            _factory->setPort(getTestPort(_initData.properties, 10));
+            _factory->setPort(getTestPort(_initData.properties, 50));
             _factory->setProtocol(protocol);
             _session = _factory->connect("userid", "abc123");
 
diff --git a/cpp/test/Glacier2/staticFiltering/Client.cpp b/cpp/test/Glacier2/staticFiltering/Client.cpp
index 5100006c5f4..969fd9b4f4f 100644
--- a/cpp/test/Glacier2/staticFiltering/Client.cpp
+++ b/cpp/test/Glacier2/staticFiltering/Client.cpp
@@ -41,7 +41,7 @@ main(int argc, char* argv[])
 int
 AttackClient::run(int, char**)
 {
-    ObjectPrx routerBase = communicator()->stringToProxy("Glacier2/router:" + getTestEndpoint(communicator(), 10));
+    ObjectPrx routerBase = communicator()->stringToProxy("Glacier2/router:" + getTestEndpoint(communicator(), 50));
     Glacier2::RouterPrx router = Glacier2::RouterPrx::checkedCast(routerBase);
     test(router);
     communicator()->setDefaultRouter(router);
@@ -148,7 +148,7 @@ AttackClient::run(int, char**)
     }
 
     ObjectPrx processBase = communicator()->stringToProxy("Glacier2/admin -f Process:" +
-                                                          getTestEndpoint(communicator(), 11));
+                                                          getTestEndpoint(communicator(), 51));
     Ice::ProcessPrx process = Ice::ProcessPrx::checkedCast(processBase);
     test(process);
     process->shutdown();
diff --git a/csharp/test/Glacier2/application/Client.cs b/csharp/test/Glacier2/application/Client.cs
index 4e9df5f6d2a..cb3e90904d3 100644
--- a/csharp/test/Glacier2/application/Client.cs
+++ b/csharp/test/Glacier2/application/Client.cs
@@ -132,13 +132,13 @@ public class Client : TestCommon.Application
     {
         Application app = new Application();
         _initData.properties.setProperty("Ice.Default.Router", "Glacier2/router:" +
-                                            getTestEndpoint(_initData.properties, 10));
+                                            getTestEndpoint(_initData.properties, 50));
         int status = app.main(args, _initData);
 
         Console.Out.Write("testing stringToProxy for process object... ");
         Console.Out.Flush();
         Ice.ObjectPrx processBase = communicator().stringToProxy("Glacier2/admin -f Process:" +
-                                                                 getTestEndpoint(communicator().getProperties(), 11));
+                                                                 getTestEndpoint(communicator().getProperties(), 51));
         Console.Out.WriteLine("ok");
 
         Console.Out.Write("testing checked cast for admin object... ");
diff --git a/csharp/test/Glacier2/router/Client.cs b/csharp/test/Glacier2/router/Client.cs
index 4560049a2ce..a996bb0275a 100644
--- a/csharp/test/Glacier2/router/Client.cs
+++ b/csharp/test/Glacier2/router/Client.cs
@@ -26,7 +26,7 @@ public class Client : TestCommon.Application
         {
             Console.Out.Write("testing stringToProxy for router... ");
             Console.Out.Flush();
-            routerBase = communicator().stringToProxy("Glacier2/router:" + getTestEndpoint(10));
+            routerBase = communicator().stringToProxy("Glacier2/router:" + getTestEndpoint(50));
             Console.Out.WriteLine("ok");
         }
 
@@ -43,7 +43,7 @@ public class Client : TestCommon.Application
             Console.Out.Write("testing router finder... ");
             Console.Out.Flush();
             Ice.RouterFinderPrx finder = Ice.RouterFinderPrxHelper.uncheckedCast(
-                communicator().stringToProxy("Ice/RouterFinder:" + getTestEndpoint(10)));
+                communicator().stringToProxy("Ice/RouterFinder:" + getTestEndpoint(50)));
             test(finder.getRouter().ice_getIdentity().Equals(router.ice_getIdentity()));
             Console.Out.WriteLine("ok");
         }
@@ -385,7 +385,7 @@ public class Client : TestCommon.Application
 
             {
                 Console.Out.Write("testing stringToProxy for admin object... ");
-                processBase = communicator().stringToProxy("Glacier2/admin -f Process:" + getTestEndpoint(11));
+                processBase = communicator().stringToProxy("Glacier2/admin -f Process:" + getTestEndpoint(51));
                 Console.Out.WriteLine("ok");
             }
 
diff --git a/csharp/test/Glacier2/sessionHelper/Client.cs b/csharp/test/Glacier2/sessionHelper/Client.cs
index 051676f4533..6b8d1ba0882 100644
--- a/csharp/test/Glacier2/sessionHelper/Client.cs
+++ b/csharp/test/Glacier2/sessionHelper/Client.cs
@@ -264,7 +264,7 @@ public class Client : TestCommon.Application
             Console.Out.Write("testing SessionHelper connect... ");
             Console.Out.Flush();
             _factory.setRouterHost(host);
-            _factory.setPort(getTestPort(10));
+            _factory.setPort(getTestPort(50));
             _factory.setProtocol(protocol);
             _session = _factory.connect("userid", "abc123");
             while(true)
@@ -384,7 +384,7 @@ public class Client : TestCommon.Application
             Ice.ObjectPrx processBase;
             {
                 Console.Out.Write("testing stringToProxy for process object... ");
-                processBase = communicator().stringToProxy("Glacier2/admin -f Process:" + getTestEndpoint(11));
+                processBase = communicator().stringToProxy("Glacier2/admin -f Process:" + getTestEndpoint(51));
                 Console.Out.WriteLine("ok");
             }
 
@@ -416,7 +416,7 @@ public class Client : TestCommon.Application
             Console.Out.Flush();
 
             _factory.setRouterHost(host);
-            _factory.setPort(getTestPort(10));
+            _factory.setPort(getTestPort(50));
             _factory.setProtocol(protocol);
             _session = _factory.connect("userid", "abc123");
             while(true)
@@ -472,7 +472,7 @@ public class Client : TestCommon.Application
         _initData = base.getInitData(ref args);
         _initData.properties.setProperty("Ice.Warn.Connections", "0");
         _initData.properties.setProperty("Ice.Default.Router", "Glacier2/router:" +
-                                         getTestEndpoint(_initData.properties, 10));
+                                         getTestEndpoint(_initData.properties, 50));
         _initData.dispatcher = delegate(Action action, Ice.Connection connection)
         {
             action();
diff --git a/java-compat/test/src/main/java/test/Glacier2/application/Client.java b/java-compat/test/src/main/java/test/Glacier2/application/Client.java
index 1135709ecd5..b7688f2b95a 100644
--- a/java-compat/test/src/main/java/test/Glacier2/application/Client.java
+++ b/java-compat/test/src/main/java/test/Glacier2/application/Client.java
@@ -150,14 +150,14 @@ public class Client extends test.Util.Application
         Application app = new Application();
 
         _initData.properties.setProperty("Ice.Default.Router",
-                                         "Glacier2/router:" + getTestEndpoint(_initData.properties, 10));
+                                         "Glacier2/router:" + getTestEndpoint(_initData.properties, 50));
 
         int status = app.main("Client", args, _initData);
 
         out.print("testing stringToProxy for process object... ");
         out.flush();
         Ice.ObjectPrx processBase = communicator().stringToProxy("Glacier2/admin -f Process:" +
-                                                               getTestEndpoint(communicator().getProperties(), 11));
+                                                               getTestEndpoint(communicator().getProperties(), 51));
         out.println("ok");
 
         out.print("testing checked cast for admin object... ");
diff --git a/java-compat/test/src/main/java/test/Glacier2/router/Client.java b/java-compat/test/src/main/java/test/Glacier2/router/Client.java
index 3f9b3919ea3..7d932ab0465 100644
--- a/java-compat/test/src/main/java/test/Glacier2/router/Client.java
+++ b/java-compat/test/src/main/java/test/Glacier2/router/Client.java
@@ -37,7 +37,7 @@ public class Client extends test.Util.Application
         {
             out.print("testing stringToProxy for router... ");
             out.flush();
-            routerBase = communicator().stringToProxy("Glacier2/router:" + getTestEndpoint(10));
+            routerBase = communicator().stringToProxy("Glacier2/router:" + getTestEndpoint(50));
             out.println("ok");
         }
 
@@ -55,7 +55,7 @@ public class Client extends test.Util.Application
             out.print("testing router finder... ");
             out.flush();
             Ice.RouterFinderPrx finder = Ice.RouterFinderPrxHelper.uncheckedCast(
-                communicator().stringToProxy("Ice/RouterFinder:" + getTestEndpoint(10)));
+                communicator().stringToProxy("Ice/RouterFinder:" + getTestEndpoint(50)));
             test(finder.getRouter().ice_getIdentity().equals(router.ice_getIdentity()));
             out.println("ok");
         }
@@ -425,7 +425,7 @@ public class Client extends test.Util.Application
 
             {
                 out.print("testing stringToProxy for process object... ");
-                processBase = communicator().stringToProxy("Glacier2/admin -f Process:" + getTestEndpoint(11));
+                processBase = communicator().stringToProxy("Glacier2/admin -f Process:" + getTestEndpoint(51));
                 out.println("ok");
             }
 
diff --git a/java-compat/test/src/main/java/test/Glacier2/sessionHelper/Client.java b/java-compat/test/src/main/java/test/Glacier2/sessionHelper/Client.java
index bcf6da8d374..33889888669 100644
--- a/java-compat/test/src/main/java/test/Glacier2/sessionHelper/Client.java
+++ b/java-compat/test/src/main/java/test/Glacier2/sessionHelper/Client.java
@@ -38,7 +38,7 @@ public class Client extends test.Util.Application
     {
         _initData = super.getInitData(argsH);
         _initData.properties.setProperty("Ice.Default.Router", "Glacier2/router:" +
-                                         getTestEndpoint(_initData.properties, 10));
+                                         getTestEndpoint(_initData.properties, 50));
         _initData.dispatcher = new Ice.Dispatcher()
             {
                 @Override
@@ -257,7 +257,7 @@ public class Client extends test.Util.Application
             out.print("testing SessionHelper connect... ");
             out.flush();
             _factory.setRouterHost(host);
-            _factory.setPort(getTestPort(10));
+            _factory.setPort(getTestPort(50));
             _factory.setProtocol(protocol);
             _session = _factory.connect("userid", "abc123");
             while(true)
@@ -377,7 +377,7 @@ public class Client extends test.Util.Application
             Ice.ObjectPrx processBase;
             {
                 out.print("testing stringToProxy for process object... ");
-                processBase = communicator().stringToProxy("Glacier2/admin -f Process:" + getTestEndpoint(11));
+                processBase = communicator().stringToProxy("Glacier2/admin -f Process:" + getTestEndpoint(51));
                 out.println("ok");
             }
 
@@ -470,7 +470,7 @@ public class Client extends test.Util.Application
             out.flush();
 
             _factory.setRouterHost(host);
-            _factory.setPort(getTestPort(10));
+            _factory.setPort(getTestPort(50));
             _factory.setProtocol(protocol);
             _session = _factory.connect("userid", "abc123");
             while(true)
diff --git a/java/test/src/main/java/test/Glacier2/application/Client.java b/java/test/src/main/java/test/Glacier2/application/Client.java
index 44391cb0290..381d0e93814 100644
--- a/java/test/src/main/java/test/Glacier2/application/Client.java
+++ b/java/test/src/main/java/test/Glacier2/application/Client.java
@@ -146,13 +146,13 @@ public class Client extends test.Util.Application
     {
         Application app = new Application();
         _initData.properties.setProperty("Ice.Default.Router", "Glacier2/router:" +
-                                            getTestEndpoint(_initData.properties, 10));
+                                            getTestEndpoint(_initData.properties, 50));
         int status = app.main("Client", args, _initData);
 
         out.print("testing stringToProxy for process object... ");
         out.flush();
         com.zeroc.Ice.ObjectPrx processBase = communicator().stringToProxy("Glacier2/admin -f Process:" +
-                                                                getTestEndpoint(communicator().getProperties(), 11));
+                                                                getTestEndpoint(communicator().getProperties(), 51));
         out.println("ok");
 
         out.print("testing checked cast for admin object... ");
diff --git a/java/test/src/main/java/test/Glacier2/router/Client.java b/java/test/src/main/java/test/Glacier2/router/Client.java
index 4a437c87e15..a083c860c3b 100644
--- a/java/test/src/main/java/test/Glacier2/router/Client.java
+++ b/java/test/src/main/java/test/Glacier2/router/Client.java
@@ -33,7 +33,7 @@ public class Client extends test.Util.Application
         {
             out.print("testing stringToProxy for router... ");
             out.flush();
-            routerBase = communicator().stringToProxy("Glacier2/router:" + getTestEndpoint(10));
+            routerBase = communicator().stringToProxy("Glacier2/router:" + getTestEndpoint(50));
             out.println("ok");
         }
 
@@ -51,7 +51,7 @@ public class Client extends test.Util.Application
             out.print("testing router finder... ");
             out.flush();
             com.zeroc.Ice.RouterFinderPrx finder = com.zeroc.Ice.RouterFinderPrx.uncheckedCast(
-                communicator().stringToProxy("Ice/RouterFinder:" + getTestEndpoint(10)));
+                communicator().stringToProxy("Ice/RouterFinder:" + getTestEndpoint(50)));
             test(finder.getRouter().ice_getIdentity().equals(router.ice_getIdentity()));
             out.println("ok");
         }
@@ -420,7 +420,7 @@ public class Client extends test.Util.Application
 
             {
                 out.print("testing stringToProxy for process object... ");
-                processBase = communicator().stringToProxy("Glacier2/admin -f Process:" + getTestEndpoint(11));
+                processBase = communicator().stringToProxy("Glacier2/admin -f Process:" + getTestEndpoint(51));
                 out.println("ok");
             }
 
diff --git a/java/test/src/main/java/test/Glacier2/sessionHelper/Client.java b/java/test/src/main/java/test/Glacier2/sessionHelper/Client.java
index f464363124a..2e1bbe197ef 100644
--- a/java/test/src/main/java/test/Glacier2/sessionHelper/Client.java
+++ b/java/test/src/main/java/test/Glacier2/sessionHelper/Client.java
@@ -37,7 +37,7 @@ public class Client extends test.Util.Application
         com.zeroc.Ice.InitializationData initData = super.getInitData(args, rArgs);
         _initData = initData;
         _initData.properties.setProperty("Ice.Default.Router", "Glacier2/router:" +
-                                         getTestEndpoint(_initData.properties, 10));
+                                         getTestEndpoint(_initData.properties, 50));
         _initData.dispatcher =
             (Runnable runnable, com.zeroc.Ice.Connection c) -> {  _workQueue.submit(runnable); };
 
@@ -238,7 +238,7 @@ public class Client extends test.Util.Application
             out.print("testing SessionHelper connect... ");
             out.flush();
             _factory.setRouterHost(host);
-            _factory.setPort(getTestPort(10));
+            _factory.setPort(getTestPort(50));
             _factory.setProtocol(protocol);
             _session = _factory.connect("userid", "abc123");
             while(true)
@@ -358,7 +358,7 @@ public class Client extends test.Util.Application
             com.zeroc.Ice.ObjectPrx processBase;
             {
                 out.print("testing stringToProxy for process object... ");
-                processBase = communicator().stringToProxy("Glacier2/admin -f Process:" + getTestEndpoint(11));
+                processBase = communicator().stringToProxy("Glacier2/admin -f Process:" + getTestEndpoint(51));
                 out.println("ok");
             }
 
@@ -447,7 +447,7 @@ public class Client extends test.Util.Application
             out.flush();
 
             _factory.setRouterHost(host);
-            _factory.setPort(getTestPort(10));
+            _factory.setPort(getTestPort(50));
             _factory.setProtocol(protocol);
             _session = _factory.connect("userid", "abc123");
             while(true)
diff --git a/js/test/Glacier2/router/Client.js b/js/test/Glacier2/router/Client.js
index 267a73198eb..76db6a620db 100644
--- a/js/test/Glacier2/router/Client.js
+++ b/js/test/Glacier2/router/Client.js
@@ -63,7 +63,7 @@
     async function allTests(out, communicator)
     {
         out.write("testing stringToProxy for router... ");
-        let routerBase = communicator.stringToProxy("Glacier2/router:default -p 12020");
+        let routerBase = communicator.stringToProxy("Glacier2/router:default -p 12060");
         test(routerBase !== null);
         out.writeLine("ok");
 
@@ -282,7 +282,7 @@
             out.writeLine("ok");
 
             out.write("testing stringToProxy for process object... ");
-            processBase = communicator.stringToProxy("Glacier2/admin -f Process:default -p 12021");
+            processBase = communicator.stringToProxy("Glacier2/admin -f Process:default -p 12061");
             out.writeLine("ok");
 
             out.write("testing checked cast for admin object... ");
diff --git a/python/test/Glacier2/application/Client.py b/python/test/Glacier2/application/Client.py
index 1608d668ce7..e8aeb90bb1f 100644
--- a/python/test/Glacier2/application/Client.py
+++ b/python/test/Glacier2/application/Client.py
@@ -79,7 +79,7 @@ class Application(Glacier2.Application):
 try:
     initData = Ice.InitializationData()
     initData.properties = Ice.createProperties(sys.argv)
-    initData.properties.setProperty("Ice.Default.Router", "Glacier2/router:default -p 12020")
+    initData.properties.setProperty("Ice.Default.Router", "Glacier2/router:default -p 12060")
 
     app = Application()
     status = app.main(sys.argv, initData=initData)
@@ -89,7 +89,7 @@ try:
     with Ice.initialize(initData) as communicator:
         sys.stdout.write("testing stringToProxy for process object... ")
         sys.stdout.flush()
-        processBase = communicator.stringToProxy("Glacier2/admin -f Process:default -p 12021");
+        processBase = communicator.stringToProxy("Glacier2/admin -f Process:default -p 12061");
         print("ok")
 
         sys.stdout.write("testing checked cast for admin object... ")
diff --git a/scripts/Glacier2Util.py b/scripts/Glacier2Util.py
index cc007b57cb1..f5fb3e295b6 100644
--- a/scripts/Glacier2Util.py
+++ b/scripts/Glacier2Util.py
@@ -12,7 +12,7 @@ from Util import *
 
 class Glacier2Router(ProcessFromBinDir, Server):
 
-    def __init__(self, portnum=10, passwords={"userid": "abc123"}, *args, **kargs):
+    def __init__(self, portnum=50, passwords={"userid": "abc123"}, *args, **kargs):
         Server.__init__(self, "glacier2router", mapping=Mapping.getByName("cpp"), desc="Glacier2 router",
                         readyCount=2, *args, **kargs)
         self.portnum = portnum