Get the remote tests running again on the command line.

It wasn't great that they weren't working, but at least they are now.

Author: shs96c

java/client/test/org/openqa/selenium/testing/drivers/BUCK

@@ -31,6 +31,7 @@ java_library(name = 'drivers',
     '//java/client/test/org/openqa/selenium:helpers',
     '//java/client/test/org/openqa/selenium/testing:annotations',
     '//java/client/test/org/openqa/selenium/testing:helpers',
+    '//java/server/src/org/openqa/grid/selenium:selenium',
     '//third_party/java/guava:guava',
     '//third_party/java/junit:junit',
     '//third_party/java/phantomjs-driver:phantomjs-driver',

java/client/test/org/openqa/selenium/testing/drivers/OutOfProcessSeleniumServer.java

@@ -19,9 +19,7 @@
 
 import static java.util.concurrent.TimeUnit.SECONDS;
 
-import com.google.common.io.Files;
-
-import org.openqa.selenium.Build;
+import org.openqa.selenium.BuckBuild;
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.net.NetworkUtils;
 import org.openqa.selenium.net.PortProber;
@@ -30,11 +28,10 @@
 import org.openqa.selenium.remote.DesiredCapabilities;
 import org.openqa.selenium.testing.InProject;
 
-import java.io.File;
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.nio.charset.Charset;
+import java.nio.file.Path;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.logging.Logger;
@@ -56,30 +53,25 @@ public void enableLogCapture() {
    *
    * @return The new server.
    */
-  public OutOfProcessSeleniumServer start() {
+  public OutOfProcessSeleniumServer start() throws IOException {
     log.info("Got a request to start a new selenium server");
     if (command != null) {
       log.info("Server already started");
       throw new RuntimeException("Server already started");
     }
 
-    String classPath = buildServerAndClasspath();
+    String serverJar = buildServerAndClasspath();
 
     int port = PortProber.findFreePort();
     String localAddress = new NetworkUtils().getPrivateLocalAddress();
     baseUrl = String.format("http://%s:%d", localAddress, port);
 
     List<String> cmdLine = new LinkedList<>();
     cmdLine.add("java");
-    cmdLine.add("-cp");
-    cmdLine.add(classPath);
-    cmdLine.add("org.openqa.grid.selenium.GridLauncher");
+    cmdLine.add("-jar");
+    cmdLine.add(serverJar);
     cmdLine.add("-port");
     cmdLine.add(String.valueOf(port));
-    cmdLine.add("-browserSideLog");
-    if (captureLogs) {
-      cmdLine.add("-captureLogsOnQuit");
-    }
     command = new CommandLine(cmdLine.toArray(new String[cmdLine.size()]));
 
     if (Boolean.getBoolean("webdriver.development")) {
@@ -92,10 +84,13 @@ public OutOfProcessSeleniumServer start() {
     try {
       URL url = new URL(baseUrl + "/wd/hub/status");
       log.info("Waiting for server status on URL " + url);
-      new UrlChecker().waitUntilAvailable(60, SECONDS, url);
+      new UrlChecker().waitUntilAvailable(30, SECONDS, url);
       log.info("Server is ready");
     } catch (UrlChecker.TimeoutException e) {
       log.severe("Server failed to start: " + e.getMessage());
+      command.destroy();
+      log.severe(command.getStdOut());
+      command = null;
       throw new RuntimeException(e);
     } catch (MalformedURLException e) {
       throw new RuntimeException(e);
@@ -122,18 +117,9 @@ public void stop() {
     command = null;
   }
 
-  private String buildServerAndClasspath() {
-    new Build().of("//java/server/src/org/openqa/grid/selenium:selenium")
-        .of("//java/server/src/org/openqa/grid/selenium:selenium:classpath")
-        .go();
-
-    String classpathFile = InProject.locate(
-        "build/java/server/src/org/openqa/grid/selenium/selenium.classpath").getAbsolutePath();
-    try {
-      return Files.readFirstLine(new File(classpathFile), Charset.defaultCharset());
-    } catch (IOException e) {
-      throw new RuntimeException(e);
-    }
+  private String buildServerAndClasspath() throws IOException {
+    Path serverJar = new BuckBuild().of("//java/server/src/org/openqa/grid/selenium:selenium").go();
+    return serverJar.toAbsolutePath().toString();
   }
 
   public URL getWebDriverUrl() {

java/client/test/org/openqa/selenium/testing/drivers/RemoteSupplier.java

@@ -24,6 +24,8 @@
 import org.openqa.selenium.remote.LocalFileDetector;
 import org.openqa.selenium.remote.RemoteWebDriver;
 
+import java.io.IOException;
+
 public class RemoteSupplier implements Supplier<WebDriver> {
 
   private static OutOfProcessSeleniumServer server = new OutOfProcessSeleniumServer();
@@ -57,7 +59,11 @@ private synchronized  void startServer() {
       return;
     }
 
-    server.start();
+    try {
+      server.start();
+    } catch (IOException e) {
+      throw new RuntimeException(e);
+    }
     started = true;
   }
 }

java/server/src/org/openqa/grid/selenium/BUCK

@@ -9,6 +9,9 @@ java_binary(name = 'selenium',
   deps = [
     ':classes',
   ],
+  visibility = [
+    '//java/client/test/org/openqa/selenium/testing/drivers:drivers',
+  ]
 )
 
 genrule(name = 'manifest',

java/server/test/org/openqa/selenium/remote/server/SessionLogsTest.java

@@ -49,6 +49,7 @@
 import org.openqa.selenium.testing.drivers.BrowserToCapabilities;
 import org.openqa.selenium.testing.drivers.OutOfProcessSeleniumServer;
 
+import java.io.IOException;
 import java.io.InputStreamReader;
 import java.net.URL;
 import java.util.Map;
@@ -61,7 +62,7 @@ public class SessionLogsTest extends JUnit4TestBase {
   private RemoteWebDriver localDriver;
 
   @BeforeClass
-  public static void startUpServer() {
+  public static void startUpServer() throws IOException {
     server = new OutOfProcessSeleniumServer();
     server.enableLogCapture();
     server.start();