Avoid adding webdriver extension to the profile if we use marionette,…

… and use a random port
roydekleijn · Sep 10, 2013 · ef4e042 · ef4e042
1 parent fe02f78
commit ef4e042
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 12 deletions.
diff --git a/java/client/src/org/openqa/selenium/firefox/FirefoxDriver.java b/java/client/src/org/openqa/selenium/firefox/FirefoxDriver.java
@@ -241,7 +241,6 @@ public Timeouts setScriptTimeout(long time, TimeUnit unit) {
   protected void startClient() {
     LazyCommandExecutor exe = (LazyCommandExecutor) getCommandExecutor();
     FirefoxProfile profileToUse = getProfile(exe.profile);
-    profileToUse.addWebDriverExtensionIfNeeded();
 
     // TODO(simon): Make this not sinfully ugly
     ExtensionConnection connection = connectTo(exe.binary, profileToUse, "localhost");

diff --git a/java/client/src/org/openqa/selenium/firefox/FirefoxProfile.java b/java/client/src/org/openqa/selenium/firefox/FirefoxProfile.java
@@ -161,14 +161,8 @@ private void verifyModel(File model) {
     }
   }
 
-  protected void addWebDriverExtensionIfNeeded() {
-    if (extensions.containsKey("webdriver")) {
-      return;
-    }
-
-    ClasspathExtension extension = new ClasspathExtension(FirefoxProfile.class,
-        "/" + FirefoxProfile.class.getPackage().getName().replace(".", "/") + "/webdriver.xpi");
-    addExtension("webdriver", extension);
+  public boolean containsWebDriverExtension() {
+    return extensions.containsKey("webdriver");
   }
 
   public void addExtension(Class<?> loadResourcesUsing, String loadFrom) throws IOException {
@@ -192,7 +186,7 @@ public void addExtension(File extensionToInstall) throws IOException {
     addExtension(extensionToInstall.getName(), new FileExtension(extensionToInstall));
   }
 
-  protected void addExtension(String key, Extension extension) {
+  public void addExtension(String key, Extension extension) {
     String name = deriveExtensionName(key);
     extensions.put(name, extension);
   }

diff --git a/java/client/src/org/openqa/selenium/firefox/internal/MarionetteConnection.java b/java/client/src/org/openqa/selenium/firefox/internal/MarionetteConnection.java
@@ -30,6 +30,7 @@
 import org.openqa.selenium.internal.Lock;
 import org.openqa.selenium.logging.LocalLogs;
 import org.openqa.selenium.logging.NeedsLocalLogs;
+import org.openqa.selenium.net.PortProber;
 import org.openqa.selenium.remote.BeanToJsonConverter;
 import org.openqa.selenium.remote.Command;
 import org.openqa.selenium.remote.DriverCommand;
@@ -93,10 +94,10 @@ public MarionetteConnection(Lock lock, FirefoxBinary binary, FirefoxProfile prof
   }
 
   public void start() throws IOException {
-    int port = 2828;
+    int port = PortProber.findFreePort();
 
     profile.setPreference("marionette.defaultPrefs.enabled", true);
-    profile.setPreference("marionette.defaultPrefs.port", 2828);
+    profile.setPreference("marionette.defaultPrefs.port", port);
     profile.setPreference("browser.warnOnQuit", false);
 
     lock.lock(connectTimeout);

diff --git a/java/client/src/org/openqa/selenium/firefox/internal/NewProfileExtensionConnection.java b/java/client/src/org/openqa/selenium/firefox/internal/NewProfileExtensionConnection.java
@@ -67,6 +67,8 @@ public NewProfileExtensionConnection(Lock lock, FirefoxBinary binary, FirefoxPro
   }
 
   public void start() throws IOException {
+    addWebDriverExtensionIfNeeded();
+
     int port = 0;
 
     lock.lock(connectTimeout);
@@ -129,6 +131,16 @@ public void start() throws IOException {
     }
   }
 
+  protected void addWebDriverExtensionIfNeeded() {
+    if (profile.containsWebDriverExtension()) {
+      return;
+    }
+
+    ClasspathExtension extension = new ClasspathExtension(FirefoxProfile.class,
+                                                          "/" + FirefoxProfile.class.getPackage().getName().replace(".", "/") + "/webdriver.xpi");
+    profile.addExtension("webdriver", extension);
+  }
+
   public Response execute(Command command) throws IOException {
     return delegate.execute(command);
   }