[chromedriver] Log exceptions thrown when quitting the session.

patch.diff

 diff --git a/java/client/src/org/openqa/selenium/chrome/ChromeOptions.java b/java/client/src/org/openqa/selenium/chrome/ChromeOptions.java
 index 423cfe9..67e0ddb 100644
 --- a/java/client/src/org/openqa/selenium/chrome/ChromeOptions.java
 +++ b/java/client/src/org/openqa/selenium/chrome/ChromeOptions.java
 @@ -71,6 +71,7 @@
    public static final String CAPABILITY = "chromeOptions";
  
    private String binary;
 +  private String androidPackage;
    private List<String> args = Lists.newArrayList();
@@ skipping 45 matching lines @@
  
 +      // Set the timeout for waiting response from server side.
 +      HttpParams params = new BasicHttpParams();
 +      params.setIntParameter(CoreConnectionPNames.SO_TIMEOUT, SO_TIMEOUT);
 +      httpMethod.setParams(params);
 +
        log(LogType.PROFILER, new HttpProfilerLogEntry(command.getName(), true));
        HttpResponse response = fallBackExecute(context, httpMethod);
        log(LogType.PROFILER, new HttpProfilerLogEntry(command.getName(), false));
 diff --git a/java/client/test/org/openqa/selenium/testing/JUnit4TestBase.java b/java/client/test/org/openqa/selenium/testing/JUnit4TestBase.java
-index e5beaf1..41e2791 100755
+index e5beaf1..5eb4477 100755
 --- a/java/client/test/org/openqa/selenium/testing/JUnit4TestBase.java
 +++ b/java/client/test/org/openqa/selenium/testing/JUnit4TestBase.java
 @@ -28,6 +28,7 @@
  import org.junit.runner.RunWith;
  import org.openqa.selenium.Pages;
  import org.openqa.selenium.WebDriver;
 +import org.openqa.selenium.WebDriverException;
  import org.openqa.selenium.environment.GlobalTestEnvironment;
  import org.openqa.selenium.environment.InProcessTestEnvironment;
  import org.openqa.selenium.environment.TestEnvironment;
-@@ -94,6 +95,21 @@ public WebDriver getWrappedDriver() {
+@@ -94,6 +95,22 @@ public WebDriver getWrappedDriver() {
    public static WebDriver actuallyCreateDriver() {
      WebDriver driver = storedDriver.get();
  
 +    // If the driver is left in a bad state, create a new one.
 +    // This happens on Android after any test that creates its own driver.
 +    // Since only one instance of Chrome can run on Android at a time, the
 +    // stored driver's browser is destroyed.
 +    try {
 +      if (driver != null)
 +        driver.getCurrentUrl();
 +    } catch (WebDriverException e) {
 +      try {
 +        driver.quit();
 +      } catch (RuntimeException ignored) {
 +        // fall through
++        logger.warning(ignored.getMessage());
 +      }
 +      driver = null;
 +    }
      if (driver == null) {
        driver = new WebDriverBuilder().get();
        storedDriver.set(driver);
-@@ -126,4 +142,4 @@ protected boolean isIeDriverTimedOutException(IllegalStateException e) {
+@@ -116,6 +133,7 @@ public static void removeDriver() {
+       current.quit();
+     } catch (RuntimeException ignored) {
+       // fall through
++      logger.warning(ignored.getMessage());
+     }
+ 
+     storedDriver.remove();
+@@ -126,4 +144,4 @@ protected boolean isIeDriverTimedOutException(IllegalStateException e) {
      return e.getClass().getName().contains("TimedOutException");
    }
  
 -}
 \ No newline at end of file
 +}
 diff --git a/java/client/test/org/openqa/selenium/testing/drivers/TestChromeDriver.java b/java/client/test/org/openqa/selenium/testing/drivers/TestChromeDriver.java
 index f8e3e02..58bd0cc 100755
 --- a/java/client/test/org/openqa/selenium/testing/drivers/TestChromeDriver.java
 +++ b/java/client/test/org/openqa/selenium/testing/drivers/TestChromeDriver.java
@@ skipping 54 matching lines @@
 --- a/rake-tasks/crazy_fun/mappings/java.rb
 +++ b/rake-tasks/crazy_fun/mappings/java.rb
 @@ -34,6 +34,7 @@ class JavaMappings
      fun.add_mapping("java_test", CrazyFunJava::RunTests.new)
      fun.add_mapping("java_test", CrazyFunJava::CreateSourceJar.new)
      fun.add_mapping("java_test", CrazyFunJava::CreateUberJar.new)
 +    fun.add_mapping("java_test", CrazyFunJava::CreateProjectSourceJar.new)
      fun.add_mapping("java_test", CrazyFunJava::CreateProjectJar.new)
    end
  end