Merge pull request #2614 from seleniumbase/fix-issue-with-chrome-for-testing
Fix issue with getting browser version from Chrome-for-Testing on Windows
This commit is contained in:
commit
36cfb2032c
|
@ -1,2 +1,2 @@
|
||||||
# seleniumbase package
|
# seleniumbase package
|
||||||
__version__ = "4.24.9"
|
__version__ = "4.24.10"
|
||||||
|
|
|
@ -232,21 +232,23 @@ def get_binary_location(browser_type, prefer_chromium=False):
|
||||||
def get_browser_version_from_binary(binary_location):
|
def get_browser_version_from_binary(binary_location):
|
||||||
try:
|
try:
|
||||||
path = binary_location
|
path = binary_location
|
||||||
|
pattern = r"\d+\.\d+\.\d+"
|
||||||
|
quad_pattern = r"\d+\.\d+\.\d+\.\d+"
|
||||||
|
if os_name() == OSType.WIN and os.path.exists(path):
|
||||||
|
path = path.replace(r"\ ", r" ").replace("\\", "\\\\")
|
||||||
|
cmd_mapping = (
|
||||||
|
'''powershell -command "&{(Get-Command '%s')'''
|
||||||
|
'''.Version.ToString()}"''' % path
|
||||||
|
)
|
||||||
|
quad_version = read_version_from_cmd(cmd_mapping, quad_pattern)
|
||||||
|
if quad_version and len(str(quad_version)) >= 9: # Eg. 122.0.0.0
|
||||||
|
return quad_version
|
||||||
|
version = read_version_from_cmd(cmd_mapping, pattern)
|
||||||
|
if version and len(str(version)) >= 7: # Eg. 122.0.0
|
||||||
|
return version
|
||||||
if binary_location.count(r"\ ") != binary_location.count(" "):
|
if binary_location.count(r"\ ") != binary_location.count(" "):
|
||||||
binary_location = binary_location.replace(" ", r"\ ")
|
binary_location = binary_location.replace(" ", r"\ ")
|
||||||
cmd_mapping = binary_location + " --version"
|
cmd_mapping = binary_location + " --version"
|
||||||
pattern = r"\d+\.\d+\.\d+"
|
|
||||||
quad_pattern = r"\d+\.\d+\.\d+\.\d+"
|
|
||||||
quad_version = read_version_from_cmd(cmd_mapping, quad_pattern)
|
|
||||||
if quad_version and len(str(quad_version)) >= 9: # Eg. 115.0.0.0
|
|
||||||
return quad_version
|
|
||||||
version = read_version_from_cmd(cmd_mapping, pattern)
|
|
||||||
if not version and os_name() == OSType.WIN and os.path.exists(path):
|
|
||||||
path = path.replace(r"\ ", r" ").replace("\\", "\\\\")
|
|
||||||
cmd_mapping = (
|
|
||||||
'''powershell -command "&{(Get-Item '%s')'''
|
|
||||||
'''.VersionInfo.ProductVersion}"''' % path
|
|
||||||
)
|
|
||||||
quad_version = read_version_from_cmd(cmd_mapping, quad_pattern)
|
quad_version = read_version_from_cmd(cmd_mapping, quad_pattern)
|
||||||
if quad_version and len(str(quad_version)) >= 9:
|
if quad_version and len(str(quad_version)) >= 9:
|
||||||
return quad_version
|
return quad_version
|
||||||
|
|
Loading…
Reference in New Issue