[py] use Firefox w/ geckodriver for remote testing

SeleniumHQ · Aug 3, 2018 · 969b05d · 969b05d
1 parent b39ea54
commit 969b05d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -115,9 +115,9 @@ matrix:
       <<: *python
       <<: *firefox-esr
       python: 3.6
-    - env: TOXENV=py36-remote
+    - env: MARIONETTE=1 TOXENV=py36-remote
       <<: *python
-      <<: *firefox-esr
+      <<: *firefox-nightly
       python: 3.6
     - env: MARIONETTE=1 TOXENV=py36-marionette
       <<: *python

diff --git a/py/conftest.py b/py/conftest.py
@@ -110,7 +110,6 @@ def fin():
             options = get_options(driver_class, request.config)
         if driver_class == 'Remote':
             capabilities = DesiredCapabilities.FIREFOX.copy()
-            capabilities['marionette'] = False
             kwargs.update({'desired_capabilities': capabilities})
             options = get_options('Firefox', request.config)
         if driver_class == 'WebKitGTK':