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

Merge pull request #2042 from seleniumbase/fix-error-handling-on-edge 

Fix error-handling on Edge
This commit is contained in:
Michael Mintz 2023-08-29 13:13:32 -04:00 committed by GitHub
parent 2552b69a90 16c32d50c4
commit 473f329505
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
seleniumbase/__version__.py
View File

@ -1,2 +1,2 @@
# seleniumbase package # seleniumbase package
__version__ = "4.17.12" __version__ = "4.17.13"

22
seleniumbase/core/browser_launcher.py
View File

@ -457,9 +457,9 @@ def _add_chrome_proxy_extension(
"""Implementation of https://stackoverflow.com/a/35293284 for """Implementation of https://stackoverflow.com/a/35293284 for
https://stackoverflow.com/questions/12848327/ https://stackoverflow.com/questions/12848327/
(Run Selenium on a proxy server that requires authentication.)""" (Run Selenium on a proxy server that requires authentication.)"""
arg_join = " ".join(sys.argv) args = " ".join(sys.argv)
if ( if (
not ("-n" in sys.argv or " -n=" in arg_join or arg_join == "-c") not ("-n" in sys.argv or " -n=" in args or args == "-c")
and not multi_proxy and not multi_proxy
): ):
# Single-threaded # Single-threaded
@ -870,10 +870,9 @@ def _set_chrome_options(
# To access the Debugger, go to: chrome://inspect/#devices # To access the Debugger, go to: chrome://inspect/#devices
# while a Chromium driver is running. # while a Chromium driver is running.
# Info: https://chromedevtools.github.io/devtools-protocol/ # Info: https://chromedevtools.github.io/devtools-protocol/
sys_argv = sys.argv args = " ".join(sys.argv)
arg_join = " ".join(sys_argv)
debug_port = 9222 debug_port = 9222
if ("-n" in sys.argv) or (" -n=" in arg_join) or ("-c" in sys.argv): if ("-n" in sys.argv or " -n=" in args or args == "-c"):
debug_port = service_utils.free_port() debug_port = service_utils.free_port()
chrome_options.add_argument("--remote-debugging-port=%s" % debug_port) chrome_options.add_argument("--remote-debugging-port=%s" % debug_port)
if swiftshader: if swiftshader:
@ -2605,8 +2604,7 @@ def get_local_driver(
# To access the Debugger, go to: edge://inspect/#devices # To access the Debugger, go to: edge://inspect/#devices
# while a Chromium driver is running. # while a Chromium driver is running.
# Info: https://chromedevtools.github.io/devtools-protocol/ # Info: https://chromedevtools.github.io/devtools-protocol/
sys_argv = sys.argv args = " ".join(sys.argv)
arg_join = " ".join(sys_argv)
free_port = 9222 free_port = 9222
if ("-n" in sys.argv or " -n=" in args or args == "-c"): if ("-n" in sys.argv or " -n=" in args or args == "-c"):
free_port = service_utils.free_port() free_port = service_utils.free_port()
@ -2670,8 +2668,7 @@ def get_local_driver(
service_args=["--disable-build-check"], service_args=["--disable-build-check"],
) )
# https://stackoverflow.com/a/56638103/7058266 # https://stackoverflow.com/a/56638103/7058266
sys_argv = sys.argv args = " ".join(sys.argv)
arg_join = " ".join(sys_argv)
free_port = 9222 free_port = 9222
if ("-n" in sys.argv or " -n=" in args or args == "-c"): if ("-n" in sys.argv or " -n=" in args or args == "-c"):
free_port = service_utils.free_port() free_port = service_utils.free_port()
@ -2744,8 +2741,7 @@ def get_local_driver(
service_args=["--disable-build-check"], service_args=["--disable-build-check"],
) )
# https://stackoverflow.com/a/56638103/7058266 # https://stackoverflow.com/a/56638103/7058266
sys_argv = sys.argv args = " ".join(sys.argv)
arg_join = " ".join(sys_argv)
free_port = 9222 free_port = 9222
if ("-n" in sys.argv or " -n=" in args or args == "-c"): if ("-n" in sys.argv or " -n=" in args or args == "-c"):
free_port = service_utils.free_port() free_port = service_utils.free_port()
@ -2778,8 +2774,8 @@ def get_local_driver(
) )
return driver return driver
elif browser_name == constants.Browser.SAFARI: elif browser_name == constants.Browser.SAFARI:
arg_join = " ".join(sys.argv) args = " ".join(sys.argv)
if ("-n" in sys.argv) or (" -n=" in arg_join) or (arg_join == "-c"): if ("-n" in sys.argv or " -n=" in args or args == "-c"):
# Skip if multithreaded # Skip if multithreaded
raise Exception("Can't run Safari tests in multithreaded mode!") raise Exception("Can't run Safari tests in multithreaded mode!")
warnings.simplefilter("ignore", category=DeprecationWarning) warnings.simplefilter("ignore", category=DeprecationWarning)