Merge pull request #461 from seleniumbase/firefox-linux-updates

Firefox WebDriver Linux updates

Author: mdmintz

requirements.txt

@@ -1,5 +1,5 @@
 pip>=19.3.1
-setuptools>=43.0.0
+setuptools>=44.0.0
 setuptools-scm>=3.3.3
 wheel>=0.33.6
 six==1.13.0
@@ -38,7 +38,7 @@ pymysql==0.9.3
 pyotp==2.3.0
 boto==2.49.0
 cffi>=1.13.2
-tqdm>=4.41.0
+tqdm>=4.41.1
 flake8==3.7.9
 certifi>=2019.11.28
 pdfminer.six==20191110

seleniumbase/core/browser_launcher.py

@@ -516,6 +516,8 @@ def get_local_driver(
                 options = webdriver.FirefoxOptions()
                 if headless:
                     options.add_argument('-headless')
+                    firefox_capabilities['moz:firefoxOptions'] = (
+                        {'args': ['-headless']})
                 if LOCAL_GECKODRIVER and os.path.exists(LOCAL_GECKODRIVER):
                     try:
                         make_driver_executable_if_not(LOCAL_GECKODRIVER)
@@ -530,15 +532,20 @@ def get_local_driver(
                               " Installing now:")
                         try:
                             sb_install.main(override="geckodriver")
-                        except Exception:
-                            print("\nWarning: Could not install geckodriver!")
+                        except Exception as e:
+                            print("\nWarning: Could not install geckodriver: "
+                                  "%s" % e)
                         sys.argv = sys_args  # Put back the original sys args
-                firefox_driver = webdriver.Firefox(
-                    firefox_profile=profile,
-                    capabilities=firefox_capabilities,
-                    options=options)
-            except WebDriverException:
-                # Skip Firefox options and try again
+                if "linux" in PLATFORM or not headless:
+                    firefox_driver = webdriver.Firefox(
+                        firefox_profile=profile,
+                        capabilities=firefox_capabilities)
+                else:
+                    firefox_driver = webdriver.Firefox(
+                        firefox_profile=profile,
+                        capabilities=firefox_capabilities,
+                        options=options)
+            except Exception:
                 profile = _create_firefox_profile(
                     downloads_path, proxy_string, user_agent, disable_csp)
                 firefox_capabilities = DesiredCapabilities.FIREFOX.copy()

setup.py

@@ -45,7 +45,7 @@
 
 setup(
     name='seleniumbase',
-    version='1.34.10',
+    version='1.34.11',
     description='Fast, Easy, and Reliable Browser Automation & Testing.',
     long_description=long_description,
     long_description_content_type='text/markdown',
@@ -121,7 +121,7 @@
         'pyotp==2.3.0',
         'boto==2.49.0',
         'cffi>=1.13.2',
-        'tqdm>=4.41.0',
+        'tqdm>=4.41.1',
         'flake8==3.7.9',
         'certifi>=2019.11.28',
         'pdfminer.six==20191110',