Grid: Found a better place to convert seconds to milliseconds

johnferro · Jan 25, 2016 · bc16ffa · bc16ffa
1 parent f362d77
commit bc16ffa
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 5 deletions.
diff --git a/java/server/src/org/openqa/grid/common/RegistrationRequest.java b/java/server/src/org/openqa/grid/common/RegistrationRequest.java
@@ -465,7 +465,7 @@ private void loadFromCommandLine(String[] args) {
       configuration.put(CLEAN_UP_CYCLE, Integer.parseInt(helper.getParamValue("-cleanUpCycle")));
     }
     if (helper.isParamPresent("-timeout")) {
-      configuration.put(TIME_OUT, Integer.parseInt(helper.getParamValue("-timeout")));
+      configuration.put(TIME_OUT, Integer.parseInt(helper.getParamValue("-timeout")) * 1000);
     }
     if (helper.isParamPresent("-browserTimeout")) {
       configuration.put(BROWSER_TIME_OUT, Integer.parseInt(helper.getParamValue("-browserTimeout")));

diff --git a/java/server/src/org/openqa/grid/internal/BaseRemoteProxy.java b/java/server/src/org/openqa/grid/internal/BaseRemoteProxy.java
@@ -144,7 +144,7 @@ public BaseRemoteProxy(RegistrationRequest request, Registry registry) {
 
     maxConcurrentSession = getConfigInteger(RegistrationRequest.MAX_SESSION);
     cleanUpCycle = getConfigInteger(RegistrationRequest.CLEAN_UP_CYCLE);
-    timeOutMs = getConfigInteger(RegistrationRequest.TIME_OUT) * 1000;
+    timeOutMs = getConfigInteger(RegistrationRequest.TIME_OUT);
     statusCheckTimeout = getConfigInteger(RegistrationRequest.STATUS_CHECK_TIMEOUT);
 
     List<DesiredCapabilities> capabilities = request.getCapabilities();

diff --git a/java/server/src/org/openqa/selenium/server/SeleniumServer.java b/java/server/src/org/openqa/selenium/server/SeleniumServer.java
@@ -1022,8 +1022,6 @@ public static RemoteControlConfiguration parseLauncherOptions(String[] args) {
         configuration.setDebugURL(getArg(args, ++i));
       } else if ("-timeout".equalsIgnoreCase(arg)) {
         configuration.setTimeoutInSeconds(Integer.parseInt(getArg(args, ++i)));
-      } else if ("-browserTimeout".equalsIgnoreCase(arg)) {
-        configuration.setBrowserTimeoutInMs(Integer.parseInt(getArg(args, ++i)));
       } else if ("-jettyThreads".equalsIgnoreCase(arg)) {
         int jettyThreadsCount = Integer.parseInt(getArg(args, ++i));
 

diff --git a/java/server/test/org/openqa/grid/internal/BaseRemoteProxyTest.java b/java/server/test/org/openqa/grid/internal/BaseRemoteProxyTest.java
@@ -147,7 +147,7 @@ public void timeouts() {
     RegistrationRequest req = RegistrationRequest.build("-role", "webdriver","-"+RegistrationRequest.REMOTE_HOST, remoteHost,"-"+RegistrationRequest.ID, "abc", "-timeout", "23", "-browserTimeout", "12","-host","localhost");
     req.getConfiguration().put(RegistrationRequest.PROXY_CLASS, null);
     RemoteProxy p = BaseRemoteProxy.getNewInstance(req, registry);
-    assertEquals(23, p.getTimeOut());
+    assertEquals(23000, p.getTimeOut());
   }