Correctly detect we're using Marionette in tests

This seems a little more robust.
babymechanic · Apr 21, 2017 · 8298121 · 8298121
1 parent 515a1cb
commit 8298121
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/java/client/test/org/openqa/selenium/testing/JUnit4TestBase.java b/java/client/test/org/openqa/selenium/testing/JUnit4TestBase.java
@@ -305,10 +305,14 @@ private static boolean matches(Browser browser, Driver[] drivers) {
           break;
 
         case MARIONETTE:
-          if (browser == Browser.ff && Boolean.getBoolean("webdriver.firefox.marionette")) {
-            return true;
+          if (browser != Browser.ff) {
+            return false;
           }
-          break;
+          if (System.getProperty("webdriver.firefox.marionette") == null ||
+              Boolean.getBoolean("webdriver.firefox.marionette")) {
+          return true;
+        }
+        break;
 
         case PHANTOMJS:
           if (browser == Browser.phantomjs) {