Correctly detect we're using Marionette in tests
This seems a little more robust.
@@ -305,7 +305,11 @@ private static boolean matches(Browser browser, Driver[] drivers) {
break;
case MARIONETTE:
- if (browser == Browser.ff && Boolean.getBoolean("webdriver.firefox.marionette")) {
+ if (browser != Browser.ff) {
+ return false;
+ }
+ if (System.getProperty("webdriver.firefox.marionette") == null ||
+ Boolean.getBoolean("webdriver.firefox.marionette")) {
return true;
}
break;
