File tree Expand file tree Collapse file tree 4 files changed +32
-14
lines changed
py/selenium/webdriver/common Expand file tree Collapse file tree 4 files changed +32
-14
lines changed Original file line number Diff line number Diff line change @@ -165,7 +165,7 @@ js_library(
165165
166166 http_archive (
167167 name = "linux_edgedriver" ,
168- url = "https://msedgedriver.azureedge.net /138.0.3351.83/edgedriver_linux64.zip" ,
168+ url = "https://msedgedriver.microsoft.com /138.0.3351.83/edgedriver_linux64.zip" ,
169169 sha256 = "ed7d3651a5087bf7cdd383c244de29fa9e6a347473ff53c0172583380c5f7256" ,
170170 build_file_content = """
171171load("@aspect_rules_js//js:defs.bzl", "js_library")
@@ -182,7 +182,7 @@ js_library(
182182
183183 http_archive (
184184 name = "mac_edgedriver" ,
185- url = "https://msedgedriver.azureedge.net /138.0.3351.83/edgedriver_mac64.zip" ,
185+ url = "https://msedgedriver.microsoft.com /138.0.3351.83/edgedriver_mac64.zip" ,
186186 sha256 = "a9e267a880300ed8dc77fc4ff12d4a66b49e3443d23c1091af277f332b2fc041" ,
187187 build_file_content = """
188188load("@aspect_rules_js//js:defs.bzl", "js_library")
Original file line number Diff line number Diff line change 2727
2828
2929def free_port () -> int :
30- """Determines a free port using sockets."""
31- free_socket = socket .socket (socket .AF_INET , socket .SOCK_STREAM )
32- free_socket .bind (("127.0.0.1" , 0 ))
33- free_socket .listen (5 )
34- port : int = free_socket .getsockname ()[1 ]
35- free_socket .close ()
30+ """Determines a free port using sockets.
31+
32+ First try IPv4, but use IPv6 if it can't bind (IPv6-only system).
33+ """
34+ free_socket = None
35+ try :
36+ # IPv4
37+ free_socket = socket .socket (socket .AF_INET , socket .SOCK_STREAM )
38+ free_socket .bind (("127.0.0.1" , 0 ))
39+ except OSError :
40+ if free_socket :
41+ free_socket .close ()
42+ # IPv6
43+ try :
44+ free_socket = socket .socket (socket .AF_INET6 , socket .SOCK_STREAM )
45+ free_socket .bind (("::1" , 0 ))
46+ except OSError :
47+ raise RuntimeError ("Can't find free port (Unable to bind to IPv4 or IPv6)" )
48+ try :
49+ port : int = free_socket .getsockname ()[1 ]
50+ except Exception as e :
51+ raise RuntimeError (f"Can't find free port: ({ e } )" )
52+ finally :
53+ free_socket .close ()
3654 return port
3755
3856
Original file line number Diff line number Diff line change @@ -45,7 +45,7 @@ pub const EDGE_NAMES: &[&str] = &[
4545] ;
4646pub const EDGEDRIVER_NAME : & str = "msedgedriver" ;
4747pub const WEBVIEW2_NAME : & str = "webview2" ;
48- const DRIVER_URL : & str = "https://msedgedriver.azureedge.net /" ;
48+ const DRIVER_URL : & str = "https://msedgedriver.microsoft.com /" ;
4949const LATEST_STABLE : & str = "LATEST_STABLE" ;
5050const LATEST_RELEASE : & str = "LATEST_RELEASE" ;
5151const BROWSER_URL : & str = "https://edgeupdates.microsoft.com/api/products/" ;
Original file line number Diff line number Diff line change @@ -256,19 +256,19 @@ def edge():
256256
257257
258258def edgedriver ():
259- r_stable = http .request ("GET" , "https://msedgedriver.azureedge.net /LATEST_STABLE" )
259+ r_stable = http .request ("GET" , "https://msedgedriver.microsoft.com /LATEST_STABLE" )
260260 stable_version = r_stable .data .decode ("utf-16" ).strip ()
261261 major_version = stable_version .split ("." )[0 ]
262262 r = http .request (
263263 "GET" ,
264- f"https://msedgedriver.azureedge.net /LATEST_RELEASE_{ major_version } _LINUX" ,
264+ f"https://msedgedriver.microsoft.com /LATEST_RELEASE_{ major_version } _LINUX" ,
265265 )
266266 linux_version = r .data .decode ("utf-16" ).strip ()
267267
268268 content = ""
269269
270270 linux = (
271- "https://msedgedriver.azureedge.net /%s/edgedriver_linux64.zip" % linux_version
271+ "https://msedgedriver.microsoft.com /%s/edgedriver_linux64.zip" % linux_version
272272 )
273273 sha = calculate_hash (linux )
274274 content = (
@@ -296,10 +296,10 @@ def edgedriver():
296296
297297 r = http .request (
298298 "GET" ,
299- f"https://msedgedriver.azureedge.net /LATEST_RELEASE_{ major_version } _MACOS" ,
299+ f"https://msedgedriver.microsoft.com /LATEST_RELEASE_{ major_version } _MACOS" ,
300300 )
301301 macos_version = r .data .decode ("utf-16" ).strip ()
302- mac = "https://msedgedriver.azureedge.net /%s/edgedriver_mac64.zip" % macos_version
302+ mac = "https://msedgedriver.microsoft.com /%s/edgedriver_mac64.zip" % macos_version
303303 sha = calculate_hash (mac )
304304 content = (
305305 content
You can’t perform that action at this time.
0 commit comments