Switch to Marionette by default in the Python client

Marionette tests can be run using ./go //py:marionette_test:run
akeyz · May 19, 2016 · a91690b · a91690b
1 parent 5b85c32
commit a91690b
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 13 deletions.
diff --git a/py/build.desc b/py/build.desc
@@ -20,7 +20,7 @@ py_test(
 
 py_test(
   name = "marionette_test",
-  deps = [ ":test_ff" ],
+  deps = [ ":test_marionette" ],
   browsers = [ "marionette" ])
 
 py_test(

diff --git a/py/selenium/webdriver/common/desired_capabilities.py b/py/selenium/webdriver/common/desired_capabilities.py
@@ -52,7 +52,7 @@ class DesiredCapabilities(object):
         "version": "",
         "platform": "ANY",
         "javascriptEnabled": True,
-        "marionette": False,
+        "marionette": True,
     }
 
     INTERNETEXPLORER = {

diff --git a/py/test/selenium/webdriver/firefox/ff_launcher_tests.py b/py/test/selenium/webdriver/firefox/ff_launcher_tests.py
@@ -23,24 +23,26 @@
 class FirefoxLauncherTests (unittest.TestCase):
 
     def testLaunchAndCloseBrowser(self):
-        self.webdriver = webdriver.Firefox()
+        capabilities = {'marionette': False}
+        self.webdriver = webdriver.Firefox(capabilities=capabilities)
         self.webdriver.quit()
 
     def testDoubleClose(self):
-        self.webdriver = webdriver.Firefox()
+        capabilities = {'marionette': False}
+        self.webdriver = webdriver.Firefox(capabilities=capabilities)
         self.webdriver.close()
         self.webdriver.close()
         self.webdriver.quit()
 
     def test_we_can_launch_multiple_firefox_instances(self):
-        self.webdriver1 = webdriver.Firefox()
-        self.webdriver2 = webdriver.Firefox()
-        self.webdriver3 = webdriver.Firefox()
+        capabilities = {'marionette': False}
+        self.webdriver1 = webdriver.Firefox(capabilities=capabilities)
+        self.webdriver2 = webdriver.Firefox(capabilities=capabilities)
+        self.webdriver3 = webdriver.Firefox(capabilities=capabilities)
         self.webdriver1.quit()
         self.webdriver2.quit()
         self.webdriver3.quit()
 
 if __name__ == "__main__":
     logging.basicConfig(level=logging.INFO)
     unittest.main()
-
diff --git a/py/test/selenium/webdriver/firefox/ff_profile_tests.py b/py/test/selenium/webdriver/firefox/ff_profile_tests.py
@@ -37,7 +37,8 @@
 class TestFirefoxProfile:
 
     def setup_method(self, method):
-        self.driver = webdriver.Firefox()
+        self.capabilities = {'marionette': False}
+        self.driver = webdriver.Firefox(capabilities=self.capabilities)
         self.webserver = SimpleWebServer()
         self.webserver.start()
 
@@ -49,7 +50,9 @@ def test_that_we_can_accept_a_profile(self):
         profile1.update_preferences()
 
         profile2 = webdriver.FirefoxProfile(profile1.path)
-        driver = webdriver.Firefox(firefox_profile=profile2)
+        driver = webdriver.Firefox(
+            capabilities=self.capabilities,
+            firefox_profile=profile2)
         title = driver.title
         driver.quit()
         assert "Hello WebDriver" == title

diff --git a/py/test/selenium/webdriver/firefox/ff_select_support_class_tests.py b/py/test/selenium/webdriver/firefox/ff_select_support_class_tests.py
@@ -17,14 +17,16 @@
 
 
 from selenium import webdriver
-from selenium.test.selenium.webdriver.common import select_class_tests 
+from selenium.test.selenium.webdriver.common import select_class_tests
 from selenium.test.selenium.webdriver.common.webserver import SimpleWebServer
 
 def setup_module(module):
     webserver = SimpleWebServer()
     webserver.start()
     FirefoxSelectElementHandlingTests.webserver = webserver
-    FirefoxSelectElementHandlingTests.driver = webdriver.Firefox()
+    capabilities = {'marionette': False}
+    FirefoxSelectElementHandlingTests.driver = webdriver.Firefox(
+        capabilities=capabilities)
 
 
 class FirefoxSelectElementHandlingTests(select_class_tests.WebDriverSelectSupportTests):
@@ -34,4 +36,3 @@ class FirefoxSelectElementHandlingTests(select_class_tests.WebDriverSelectSuppor
 def teardown_module(module):
     FirefoxSelectElementHandlingTests.driver.quit()
     FirefoxSelectElementHandlingTests.webserver.stop()
-
diff --git a/rake-tasks/browsers.rb b/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",