Try and fix some of the failing RC tests

Author: shs96c

java/client/test/com/thoughtworks/selenium/BUCK

@@ -59,6 +59,7 @@ java_library(
     '//java/client/test/org/openqa/selenium:helpers',
     '//java/client/test/org/openqa/selenium/environment:environment',
     '//java/client/test/org/openqa/selenium/testing:helpers',
+    '//java/client/test/org/openqa/selenium/testing:test-base',
     '//java/client/test/org/openqa/selenium/testing/drivers:browser',
     '//java/client/test/org/openqa/selenium/testing/drivers:drivers',
     '//java/server/test/org/openqa/selenium:server-with-tests',

java/client/test/com/thoughtworks/selenium/corebased/TestBasicAuth.java

@@ -18,18 +18,30 @@
 
 package com.thoughtworks.selenium.corebased;
 
+import static org.junit.Assume.assumeFalse;
+import static org.junit.Assume.assumeTrue;
+
 import com.thoughtworks.selenium.InternalSelenseTestBase;
 
+import org.junit.Assume;
 import org.junit.Test;
+import org.openqa.selenium.HasCapabilities;
+import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.environment.GlobalTestEnvironment;
 import org.openqa.selenium.environment.webserver.AppServer;
+import org.openqa.selenium.internal.WrapsDriver;
+import org.openqa.selenium.testing.TestUtilities;
 
 import java.net.MalformedURLException;
 import java.net.URL;
 
 public class TestBasicAuth extends InternalSelenseTestBase {
   @Test
   public void testBasicAuth() throws Exception {
+    assumeFalse(
+        "Geckodriver does not support basic auth without user interaction.",
+        selenium instanceof WrapsDriver &&
+        TestUtilities.isFirefox(((WrapsDriver) selenium).getWrappedDriver()));
     selenium.open(getUrl());
     assertEquals(selenium.getTitle(), "Welcome");
   }

java/client/test/com/thoughtworks/selenium/corebased/TestClickAt.java

@@ -28,7 +28,7 @@
 import org.openqa.selenium.remote.CapabilityType;
 
 public class TestClickAt extends InternalSelenseTestBase {
-  @Test
+  @Test(timeout = 60000)
   public void testClickAt() throws Exception {
     selenium.open("../tests/html/test_click_page1.html");
     verifyEquals(selenium.getText("link"), "Click here for next page");

java/client/test/org/openqa/selenium/firefox/MarionetteTest.java

@@ -167,7 +167,7 @@ public void canUseSameProfileInCapabilitiesAndDirectly() {
 
     verifyItIsMarionette(localDriver);
   }
-  
+
   @Test
   public void canPassCapabilitiesBinaryAndProfileSeparately() throws IOException {
     FirefoxBinary binary = spy(new FirefoxBinary());