Skip to content

Fix error-handling on Edge #2042

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 29, 2023
Merged

Fix error-handling on Edge #2042

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d7d7bb
Refactor and fix error-handling on Edge
mdmintz Aug 29, 2023
16c32d5
Version 4.17.13
mdmintz Aug 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion seleniumbase/__version__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# seleniumbase package
__version__ = "4.17.12"
__version__ = "4.17.13"
22 changes: 9 additions & 13 deletions seleniumbase/core/browser_launcher.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,9 +457,9 @@ def _add_chrome_proxy_extension(
"""Implementation of https://stackoverflow.com/a/35293284 for
https://stackoverflow.com/questions/12848327/
(Run Selenium on a proxy server that requires authentication.)"""
arg_join = " ".join(sys.argv)
args = " ".join(sys.argv)
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
):
# Single-threaded
Expand Down Expand Up @@ -870,10 +870,9 @@ def _set_chrome_options(
# To access the Debugger, go to: chrome://inspect/#devices
# while a Chromium driver is running.
# Info: https://chromedevtools.github.io/devtools-protocol/
sys_argv = sys.argv
arg_join = " ".join(sys_argv)
args = " ".join(sys.argv)
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()
chrome_options.add_argument("--remote-debugging-port=%s" % debug_port)
if swiftshader:
Expand Down Expand Up @@ -2605,8 +2604,7 @@ def get_local_driver(
# To access the Debugger, go to: edge://inspect/#devices
# while a Chromium driver is running.
# Info: https://chromedevtools.github.io/devtools-protocol/
sys_argv = sys.argv
arg_join = " ".join(sys_argv)
args = " ".join(sys.argv)
free_port = 9222
if ("-n" in sys.argv or " -n=" in args or args == "-c"):
free_port = service_utils.free_port()
Expand Down Expand Up @@ -2670,8 +2668,7 @@ def get_local_driver(
service_args=["--disable-build-check"],
)
# https://stackoverflow.com/a/56638103/7058266
sys_argv = sys.argv
arg_join = " ".join(sys_argv)
args = " ".join(sys.argv)
free_port = 9222
if ("-n" in sys.argv or " -n=" in args or args == "-c"):
free_port = service_utils.free_port()
Expand Down Expand Up @@ -2744,8 +2741,7 @@ def get_local_driver(
service_args=["--disable-build-check"],
)
# https://stackoverflow.com/a/56638103/7058266
sys_argv = sys.argv
arg_join = " ".join(sys_argv)
args = " ".join(sys.argv)
free_port = 9222
if ("-n" in sys.argv or " -n=" in args or args == "-c"):
free_port = service_utils.free_port()
Expand Down Expand Up @@ -2778,8 +2774,8 @@ def get_local_driver(
)
return driver
elif browser_name == constants.Browser.SAFARI:
arg_join = " ".join(sys.argv)
if ("-n" in sys.argv) or (" -n=" in arg_join) or (arg_join == "-c"):
args = " ".join(sys.argv)
if ("-n" in sys.argv or " -n=" in args or args == "-c"):
# Skip if multithreaded
raise Exception("Can't run Safari tests in multithreaded mode!")
warnings.simplefilter("ignore", category=DeprecationWarning)
Expand Down