Set Marionette flag appropriately in Python tests

Author: davehunt

py/build.desc

@@ -20,7 +20,7 @@ py_test(
 
 py_test(
   name = "marionette_test",
-  deps = [ ":test_ff" ],
+  deps = [ ":test_marionette" ],
   browsers = [ "marionette" ])
 
 py_test(

rake-tasks/browsers.rb

@@ -9,6 +9,7 @@
       :dir => "firefox", # Directory to put tests in/read tests from
       :file_string => "ff", # Browser-string to use in test filenames
       :class => "Firefox", # As per py/selenium/webdriver/__init__.py
+      :constructor_args => "capabilities={'marionette': False}",
       :resources => [
         { "//javascript/firefox-driver:webdriver" => "selenium/webdriver/firefox/" },
         { "//cpp:noblur" => "selenium/webdriver/firefox/x86/x_ignore_nofocus.so" },
@@ -27,6 +28,7 @@
       :dir => "firefox", # Directory to put tests in/read tests from
       :file_string => "marionette", # Browser-string to use in test filenames
       :class => "Firefox", # As per py/selenium/webdriver/__init__.py
+      :constructor_args => "capabilities={'marionette': True}",
     },
     :java => {
       :class => "org.openqa.selenium.firefox.SynthesizedFirefoxDriver",