Skip to content

Commit 69cd752

Browse files
diemoldiemol
authored
Merge branch 'trunk' into dev_warnings
2 parents 85deed5 + f296ca9 commit 69cd752

30 files changed

Lines changed: 1108 additions & 934 deletions

‎.github/actions/bazel-test/action.yml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
name: 'Run bazel query and pass found targets to bazel test'
22
inputs:
3-
query: # id of input
3+
query: # id of input
44
required: true
5+
attempts:
6+
required: false
7+
default: 1
58
runs:
69
using: "composite"
710
steps:
811
- run: |
912
cp .github/.bazelrc.local .
10-
bazel query "${{ inputs.query }}" | xargs bazel test
13+
bazel query "${{ inputs.query }}" | xargs bazel test --flaky_test_attempts=${{ inputs.attempts }}
1114
shell: bash

‎.github/workflows/java.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ jobs:
135135
uses: ./.github/actions/bazel-test
136136
with:
137137
query: attr(tags, ${{ matrix.browser }}, tests(//java/...)) except attr(tags, 'lint|rc|remote', tests(//java/...))
138+
attempts: 3
138139
env:
139140
DISPLAY: :99
140141

@@ -175,6 +176,7 @@ jobs:
175176
uses: ./.github/actions/bazel-test
176177
with:
177178
query: attr(tags, ${{ matrix.browser }}, tests(//java/...)) intersect attr(tags, 'remote', tests(//java/...))
179+
attempts: 3
178180
env:
179181
DISPLAY: :99
180182

@@ -205,11 +207,10 @@ jobs:
205207
- name: Start XVFB
206208
run: Xvfb :99 &
207209
- name: Run browser tests in Firefox
208-
uses: nick-invision/retry@v2
210+
uses: ./.github/actions/bazel-test
209211
with:
210-
timeout_minutes: 20
211-
max_attempts: 3
212-
command: bazel query "attr(tags, rc, tests(//java/...))" | xargs bazel test
212+
query: attr(tags, rc, tests(//java/...))
213+
attempts: 3
213214
env:
214215
DISPLAY: :99
215216

‎WORKSPACE‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,9 @@ bazel_skylib_workspace()
5050

5151
http_archive(
5252
name = "rules_python",
53-
url = "https://github.com/bazelbuild/rules_python/releases/download/0.5.0/rules_python-0.5.0.tar.gz",
54-
sha256 = "cd6730ed53a002c56ce4e2f396ba3b3be262fd7cb68339f0377a45e8227fe332",
53+
sha256 = "a30abdfc7126d497a7698c29c46ea9901c6392d6ed315171a6df5ce433aa4502",
54+
strip_prefix = "rules_python-0.6.0",
55+
url = "https://github.com/bazelbuild/rules_python/archive/0.6.0.tar.gz",
5556
)
5657

5758
# This one is only needed if you're using the packaging rules.

‎java/maven_deps.bzl‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ load("@rules_jvm_external//:defs.bzl", "maven_install")
22
load("@rules_jvm_external//:specs.bzl", "maven")
33

44
def selenium_java_deps():
5-
netty_version = "4.1.70.Final"
5+
netty_version = "4.1.71.Final"
66
opentelemetry_version = "1.9.1"
77

88
maven_install(
@@ -36,6 +36,12 @@ def selenium_java_deps():
3636
"io.netty:netty-transport:%s" % netty_version,
3737
"io.netty:netty-transport-classes-epoll:%s" % netty_version,
3838
"io.netty:netty-transport-classes-kqueue:%s" % netty_version,
39+
# Start - Needed to support unix domain sockets
40+
"io.netty:netty-transport-native-epoll:%s" % netty_version,
41+
"io.netty:netty-transport-native-epoll:jar:linux-x86_64:%s" % netty_version,
42+
"io.netty:netty-transport-native-kqueue:%s" % netty_version,
43+
"io.netty:netty-transport-native-kqueue:jar:osx-x86_64:%s" % netty_version,
44+
# End - Needed to support unix domain sockets
3945
"io.netty:netty-transport-native-unix-common:%s" % netty_version,
4046
"io.opentelemetry:opentelemetry-api:%s" % opentelemetry_version,
4147
"io.opentelemetry:opentelemetry-context:%s" % opentelemetry_version,

‎java/maven_install.json‎

Lines changed: 740 additions & 624 deletions
Large diffs are not rendered by default.

‎java/src/org/openqa/selenium/HealthCheckFailedException.java‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
// Licensed to the Software Freedom Conservancy (SFC) under one
2+
// or more contributor license agreements. See the NOTICE file
3+
// distributed with this work for additional information
4+
// regarding copyright ownership. The SFC licenses this file
5+
// to you under the Apache License, Version 2.0 (the
6+
// "License"); you may not use this file except in compliance
7+
// with the License. You may obtain a copy of the License at
8+
//
9+
// http://www.apache.org/licenses/LICENSE-2.0
10+
//
11+
// Unless required by applicable law or agreed to in writing,
12+
// software distributed under the License is distributed on an
13+
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
// KIND, either express or implied. See the License for the
15+
// specific language governing permissions and limitations
16+
// under the License.
17+
18+
package org.openqa.selenium;
19+
20+
/**
21+
* Indicates that a Node health check failed.
22+
*/
23+
public class HealthCheckFailedException extends WebDriverException {
24+
25+
public HealthCheckFailedException(String msg, Throwable cause) {
26+
super(msg, cause);
27+
}
28+
}

0 commit comments

Comments
 (0)