Implementing ability to ignore tests in grid environment

Author: barancev

java/client/test/org/openqa/selenium/remote/RemoteWebDriverScreenshotTest.java

@@ -21,6 +21,7 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import static org.openqa.selenium.OutputType.BASE64;
+import static org.openqa.selenium.testing.Driver.GRID;
 import static org.openqa.selenium.testing.Driver.HTMLUNIT;
 
 import org.junit.Test;
@@ -36,6 +37,7 @@
 public class RemoteWebDriverScreenshotTest extends JUnit4TestBase {
 
   @Test
+  @Ignore(GRID)
   public void testShouldBeAbleToGrabASnapshotOnException() {
     if (!(driver instanceof RemoteWebDriver)) {
       System.out.println("Skipping test: driver is not a remote webdriver");

java/client/test/org/openqa/selenium/testing/Driver.java

@@ -26,6 +26,8 @@ public enum Driver {
   IE,
   MARIONETTE,
   PHANTOMJS,
-  REMOTE,
   SAFARI,
+
+  REMOTE,
+  GRID
 }

java/client/test/org/openqa/selenium/testing/JUnit4TestBase.java

@@ -335,6 +335,12 @@ private static boolean matches(Browser browser, Driver[] drivers) {
           }
           break;
 
+        case GRID:
+          if (Boolean.getBoolean("selenium.browser.grid")) {
+            return true;
+          }
+          break;
+
         case SAFARI:
           if (browser == Browser.safari) {
             return true;

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

@@ -24,6 +24,7 @@
 import static org.openqa.selenium.testing.Driver.CHROME;
 import static org.openqa.selenium.testing.Driver.EDGE;
 import static org.openqa.selenium.testing.Driver.FIREFOX;
+import static org.openqa.selenium.testing.Driver.GRID;
 import static org.openqa.selenium.testing.Driver.HTMLUNIT;
 import static org.openqa.selenium.testing.Driver.IE;
 import static org.openqa.selenium.testing.Driver.MARIONETTE;
@@ -167,9 +168,14 @@ public void setBrowser(Browser browser) {
   }
 
   private void addIgnoresForBrowser(Browser browser, IgnoreComparator comparator) {
-    if (Boolean.getBoolean("selenium.browser.remote") || SauceDriver.shouldUseSauce()) {
+    if (Boolean.getBoolean("selenium.browser.remote")
+        || Boolean.getBoolean("selenium.browser.grid")
+        || SauceDriver.shouldUseSauce()) {
       comparator.addDriver(REMOTE);
     }
+    if (Boolean.getBoolean("selenium.browser.grid")) {
+      comparator.addDriver(GRID);
+    }
 
     switch (browser) {
       case chrome: