Skip to content

Commit 116a041

Browse files
cgoldbergcgoldberg
authored
Merge branch 'SeleniumHQ:trunk' into py-selenium-manager-arm-support
2 parents f8db3ee + 1d8078e commit 116a041

File tree

4 files changed

+34
-38
lines changed

4 files changed

+34
-38
lines changed

‎CONTRIBUTING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ significant and valuable contributions over time are made _Committers_
5757
and given commit-access to the project.
5858

5959
If you're looking for easy bugs, have a look at
60-
[issues labelled E-easy](https://github.com/SeleniumHQ/selenium/issues?q=is%3Aopen+is%3Aissue+label%3AE-easy)
60+
[issues labelled: `good first issue`](https://github.com/SeleniumHQ/selenium/issues?q=is%3Aopen%20is%3Aissue%20label%3A%22good%20first%20issue%22)
6161
on Github.
6262

6363
This document will guide you through the contribution process.

‎common/mirror/selenium‎

Lines changed: 23 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,35 @@
11
[
2+
{
3+
"tag_name": "selenium-4.35.0",
4+
"assets": [
5+
{
6+
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.35.0/selenium-dotnet-4.35.0.zip"
7+
},
8+
{
9+
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.35.0/selenium-dotnet-strongnamed-4.35.0.zip"
10+
},
11+
{
12+
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.35.0/selenium-java-4.35.0.zip"
13+
},
14+
{
15+
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.35.0/selenium-server-4.35.0.jar"
16+
},
17+
{
18+
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.35.0/selenium-server-4.35.0.zip"
19+
}
20+
]
21+
},
222
{
323
"tag_name": "nightly",
424
"assets": [
525
{
6-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-java-4.35.0-SNAPSHOT.zip"
26+
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-java-4.36.0-SNAPSHOT.zip"
727
},
828
{
9-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-server-4.35.0-SNAPSHOT.jar"
29+
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-server-4.36.0-SNAPSHOT.jar"
1030
},
1131
{
12-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-server-4.35.0-SNAPSHOT.zip"
32+
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/nightly/selenium-server-4.36.0-SNAPSHOT.zip"
1333
}
1434
]
1535
},
@@ -791,31 +811,5 @@
791811
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.7.0/selenium-server-4.7.2.zip"
792812
}
793813
]
794-
},
795-
{
796-
"tag_name": "selenium-4.6.0",
797-
"assets": [
798-
{
799-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.6.0/IEDriverServer_Win32_4.6.0.zip"
800-
},
801-
{
802-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.6.0/IEDriverServer_x64_4.6.0.zip"
803-
},
804-
{
805-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.6.0/selenium-dotnet-4.6.0.zip"
806-
},
807-
{
808-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.6.0/selenium-dotnet-strongnamed-4.6.0.zip"
809-
},
810-
{
811-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.6.0/selenium-java-4.6.0.zip"
812-
},
813-
{
814-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.6.0/selenium-server-4.6.0.jar"
815-
},
816-
{
817-
"browser_download_url": "https://github.com/SeleniumHQ/selenium/releases/download/selenium-4.6.0/selenium-server-4.6.0.zip"
818-
}
819-
]
820814
}
821815
]

‎common/repositories.bzl‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -199,8 +199,8 @@ js_library(
199199

200200
http_archive(
201201
name = "linux_chrome",
202-
url = "https://storage.googleapis.com/chrome-for-testing-public/139.0.7258.66/linux64/chrome-linux64.zip",
203-
sha256 = "4ee01c09848cce8cbb0b2ad1a86571caf9889bf771f01225ea4bb83eeec8da8a",
202+
url = "https://storage.googleapis.com/chrome-for-testing-public/139.0.7258.68/linux64/chrome-linux64.zip",
203+
sha256 = "57966f0d19e7c4294d89e7fa25b1a6f0801475c3d51cf708597d5af9a9e474f8",
204204
build_file_content = """
205205
load("@aspect_rules_js//js:defs.bzl", "js_library")
206206
package(default_visibility = ["//visibility:public"])
@@ -220,8 +220,8 @@ js_library(
220220
)
221221
http_archive(
222222
name = "mac_chrome",
223-
url = "https://storage.googleapis.com/chrome-for-testing-public/139.0.7258.66/mac-x64/chrome-mac-x64.zip",
224-
sha256 = "9c1e521e9887ff4e21061ad142a22de522e91b3279544e08f510633549c0ff21",
223+
url = "https://storage.googleapis.com/chrome-for-testing-public/139.0.7258.68/mac-x64/chrome-mac-x64.zip",
224+
sha256 = "a49442c4cc6a28faeeecde16d27b5b8a1c5306020788c81160f2a19388ecf645",
225225
strip_prefix = "chrome-mac-x64",
226226
patch_cmds = [
227227
"mv 'Google Chrome for Testing.app' Chrome.app",
@@ -241,8 +241,8 @@ js_library(
241241
)
242242
http_archive(
243243
name = "linux_chromedriver",
244-
url = "https://storage.googleapis.com/chrome-for-testing-public/139.0.7258.66/linux64/chromedriver-linux64.zip",
245-
sha256 = "54e7a0bd1050018c17dc529167a5deecb9dd709ecbb926be6d9599a22e86e22a",
244+
url = "https://storage.googleapis.com/chrome-for-testing-public/139.0.7258.68/linux64/chromedriver-linux64.zip",
245+
sha256 = "ec29104132a6ff1ae5f2ffe7b27b7ff675a58ab9b1ef616badcbdd35577b31b3",
246246
strip_prefix = "chromedriver-linux64",
247247
build_file_content = """
248248
load("@aspect_rules_js//js:defs.bzl", "js_library")
@@ -259,8 +259,8 @@ js_library(
259259

260260
http_archive(
261261
name = "mac_chromedriver",
262-
url = "https://storage.googleapis.com/chrome-for-testing-public/139.0.7258.66/mac-x64/chromedriver-mac-x64.zip",
263-
sha256 = "12ed690058dbffa45e0239675a7b70bf232de14f8c95c9a717ca33482cdd52b6",
262+
url = "https://storage.googleapis.com/chrome-for-testing-public/139.0.7258.68/mac-x64/chromedriver-mac-x64.zip",
263+
sha256 = "2b9787f5f758c9f3e3888ac23270f8de47b168679718a4440bd1cea2b3cc57e9",
264264
strip_prefix = "chromedriver-mac-x64",
265265
build_file_content = """
266266
load("@aspect_rules_js//js:defs.bzl", "js_library")

‎py/selenium/webdriver/common/utils.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ def free_port() -> int:
4444
free_socket = socket.socket(socket.AF_INET6, socket.SOCK_STREAM)
4545
free_socket.bind(("::1", 0))
4646
except OSError:
47+
if free_socket:
48+
free_socket.close()
4749
raise RuntimeError("Can't find free port (Unable to bind to IPv4 or IPv6)")
4850
try:
4951
port: int = free_socket.getsockname()[1]

0 commit comments

Comments
 (0)