Skip to content

Commit 6fc17a0

Browse files
committed
Skipping profile cleaning step
Firefox should be able to work without this preparation activity, but we have to watch CI carefully to ensure this is true. The reason for this change is not just the driver performance on start. Running Firefox 40 with -silent option on the profile prepared by Selenium crashes the browser.
1 parent 6ee07f0 commit 6fc17a0

File tree

3 files changed

+0
-15
lines changed

3 files changed

+0
-15
lines changed

java/client/src/org/openqa/selenium/firefox/FirefoxBinary.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -237,16 +237,6 @@ public String getConsoleOutput() throws IOException {
237237
return Streams.drainStream(stream);
238238
}
239239

240-
public void clean(FirefoxProfile profile, File profileDir) throws IOException {
241-
startProfile(profile, profileDir, "-silent");
242-
try {
243-
waitFor(timeout);
244-
} catch (InterruptedException e) {
245-
process.destroy();
246-
throw new WebDriverException(e);
247-
}
248-
}
249-
250240
public long getTimeout() {
251241
return timeout;
252242
}

java/client/src/org/openqa/selenium/firefox/internal/MarionetteConnection.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323

2424
import org.openqa.selenium.Beta;
2525
import org.openqa.selenium.WebDriverException;
26-
import org.openqa.selenium.WebElement;
2726
import org.openqa.selenium.firefox.ExtensionConnection;
2827
import org.openqa.selenium.firefox.FirefoxBinary;
2928
import org.openqa.selenium.firefox.FirefoxDriver;
@@ -107,8 +106,6 @@ public void start() throws IOException {
107106
try {
108107
profileDir = profile.layoutOnDisk();
109108

110-
process.clean(profile, profileDir);
111-
112109
String firefoxLogFile = System.getProperty(FirefoxDriver.SystemProperty.BROWSER_LOGFILE);
113110

114111
if (firefoxLogFile != null) {

java/client/src/org/openqa/selenium/firefox/internal/NewProfileExtensionConnection.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,6 @@ public void start() throws IOException {
9292

9393
profileDir = profile.layoutOnDisk();
9494

95-
process.clean(profile, profileDir);
96-
9795
delegate = new HttpCommandExecutor(buildUrl(host, port));
9896
delegate.setLocalLogs(logs);
9997
String firefoxLogFile = System.getProperty(FirefoxDriver.SystemProperty.BROWSER_LOGFILE);

0 commit comments

Comments
 (0)