test_framework
/
SeleniumBase
mirror of https://github.com/seleniumbase/SeleniumBase.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Combine duplicate code from two places into one

This commit is contained in:
Michael Mintz 2019-06-19 01:18:03 -04:00
parent 2915b6084c
commit 3e698b6d5c
1 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
seleniumbase/core/browser_launcher.py
View File

@ -129,6 +129,16 @@ def _set_chrome_options(
chrome_options = _add_chrome_proxy_extension( chrome_options = _add_chrome_proxy_extension(
chrome_options, proxy_string, proxy_user, proxy_pass) chrome_options, proxy_string, proxy_user, proxy_pass)
chrome_options.add_argument('--proxy-server=%s' % proxy_string) chrome_options.add_argument('--proxy-server=%s' % proxy_string)
if headless:
if not proxy_auth:
# Headless Chrome doesn't support extensions, which are
# required when using a proxy server that has authentication.
# Instead, base_case.py will use PyVirtualDisplay when not
# using Chrome's built-in headless mode. See link for details:
# https://bugs.chromium.org/p/chromium/issues/detail?id=706008
chrome_options.add_argument("--headless")
chrome_options.add_argument("--disable-gpu")
chrome_options.add_argument("--no-sandbox")
return chrome_options return chrome_options
@ -280,16 +290,6 @@ def get_remote_driver(
chrome_options = _set_chrome_options( chrome_options = _set_chrome_options(
downloads_path, headless, proxy_string, proxy_auth, downloads_path, headless, proxy_string, proxy_auth,
proxy_user, proxy_pass, user_agent, disable_csp) proxy_user, proxy_pass, user_agent, disable_csp)
if headless:
if not proxy_auth:
# Headless Chrome doesn't support extensions, which are
# required when using a proxy server that has authentication.
# Instead, base_case.py will use PyVirtualDisplay when not
# using Chrome's built-in headless mode. See link for details:
# https://bugs.chromium.org/p/chromium/issues/detail?id=706008
chrome_options.add_argument("--headless")
chrome_options.add_argument("--disable-gpu")
chrome_options.add_argument("--no-sandbox")
capabilities = chrome_options.to_capabilities() capabilities = chrome_options.to_capabilities()
for key in desired_caps.keys(): for key in desired_caps.keys():
capabilities[key] = desired_caps[key] capabilities[key] = desired_caps[key]
@ -491,16 +491,6 @@ def get_local_driver(
chrome_options = _set_chrome_options( chrome_options = _set_chrome_options(
downloads_path, headless, proxy_string, proxy_auth, downloads_path, headless, proxy_string, proxy_auth,
proxy_user, proxy_pass, user_agent, disable_csp) proxy_user, proxy_pass, user_agent, disable_csp)
if headless:
# Headless Chrome doesn't support extensions, which are
# required when using a proxy server that has authentication.
# Instead, base_case.py will use PyVirtualDisplay when not
# using Chrome's built-in headless mode. See link for details:
# https://bugs.chromium.org/p/chromium/issues/detail?id=706008
if not proxy_auth:
chrome_options.add_argument("--headless")
chrome_options.add_argument("--disable-gpu")
chrome_options.add_argument("--no-sandbox")
if LOCAL_CHROMEDRIVER and os.path.exists(LOCAL_CHROMEDRIVER): if LOCAL_CHROMEDRIVER and os.path.exists(LOCAL_CHROMEDRIVER):
make_driver_executable_if_not(LOCAL_CHROMEDRIVER) make_driver_executable_if_not(LOCAL_CHROMEDRIVER)
return webdriver.Chrome( return webdriver.Chrome(