Skip to content

Commit f93a1f5

Browse files
authored
Merge branch 'trunk' into rb_add_argument_for_websocket_port
2 parents 58cfb2e + 05ab017 commit f93a1f5

File tree

7 files changed

+19
-10
lines changed

7 files changed

+19
-10
lines changed

common/remote-build/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ platform(
3838
"@platforms//cpu:x86_64",
3939
],
4040
exec_properties = {
41-
"container-image": "docker://docker.io/shs96c/selenium-remote-build@sha256:314b60a3c2b82f512c0f3fdba0aed8983f2b9bfdf2901a4f41511abdfd6dd74a",
41+
"container-image": "docker://docker.io/selenium/selenium-remote-build@sha256:ca164352826812f02eaa1b4dab89adcf5b3e57deb6798dd9f15d004099db59fe",
4242
"OSFamily": "Linux",
4343
"dockerReuse": "True",
4444
"dockerRunAsRoot": "False",

py/selenium/webdriver/remote/shadowroot.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,11 @@ def find_elements(self, by: str = By.ID, value: str = None):
9797
9898
Example:
9999
--------
100-
element = driver.find_element(By.ID, 'foo')
100+
element = driver.find_elements(By.ID, 'foo')
101101
102102
Returns:
103103
-------
104-
WebElement
104+
List[WebElement]
105105
list of `WebElements` matching locator strategy found on the page.
106106
"""
107107
if by == By.ID:

py/selenium/webdriver/remote/webdriver.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -916,11 +916,11 @@ def find_elements(self, by=By.ID, value: Optional[str] = None) -> List[WebElemen
916916
917917
Example:
918918
--------
919-
element = driver.find_element(By.ID, 'foo')
919+
element = driver.find_elements(By.ID, 'foo')
920920
921921
Returns:
922922
-------
923-
WebElement
923+
List[WebElement]
924924
list of `WebElements` matching locator strategy found on the page.
925925
"""
926926
by, value = self.locator_converter.convert(by, value)

py/selenium/webdriver/remote/webelement.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -619,11 +619,11 @@ def find_elements(self, by=By.ID, value=None) -> List[WebElement]:
619619
620620
Example:
621621
--------
622-
>>> element = driver.find_element(By.ID, 'foo')
622+
>>> element = driver.find_elements(By.ID, 'foo')
623623
624624
Returns:
625625
-------
626-
WebElement
626+
List[WebElement]
627627
list of `WebElements` matching locator strategy found on the page.
628628
"""
629629
by, value = self._parent.locator_converter.convert(by, value)

scripts/dev-image/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Used to create a development image for working on Selenium
2-
FROM shs96c/selenium-remote-build:latest
2+
FROM selenium/selenium-remote-build:latest
33

44
USER root
55

scripts/remote-image/Dockerfile

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Our images must be for Linux x86_64
2-
FROM --platform=linux/amd64 ubuntu:jammy@sha256:ed1544e454989078f5dec1bfdabd8c5cc9c48e0705d07b678ab6ae3fb61952d2
2+
FROM --platform=linux/amd64 ubuntu:focal@sha256:8e5c4f0285ecbb4ead070431d29b576a530d3166df73ec44affc1cd27555141b
33

44
ENV DEBIAN_FRONTEND=noninteractive
55

@@ -21,6 +21,15 @@ RUN apt-get -qqy update && \
2121
RUN apt-get update -qqy && \
2222
apt-get install -y wget gnupg2 && \
2323
wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - && echo "deb http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google-chrome.list && \
24+
install -d -m 0755 /etc/apt/keyrings && \
25+
wget -q https://packages.mozilla.org/apt/repo-signing-key.gpg -O- | tee /etc/apt/keyrings/packages.mozilla.org.asc > /dev/null && \
26+
gpg -n -q --import --import-options import-show /etc/apt/keyrings/packages.mozilla.org.asc | awk '/pub/{getline; gsub(/^ +| +$/,""); if($0 == "35BAA0B33E9EB396F59CA838C0BA5CE6DC6315A3") print "\nThe key fingerprint matches ("$0").\n"; else print "\nVerification failed: the fingerprint ("$0") does not match the expected one.\n"}' && \
27+
echo "deb [signed-by=/etc/apt/keyrings/packages.mozilla.org.asc] https://packages.mozilla.org/apt mozilla main" | tee -a /etc/apt/sources.list.d/mozilla.list > /dev/null && \
28+
echo '\
29+
Package: * \
30+
Pin: origin packages.mozilla.org \
31+
Pin-Priority: 1000 \
32+
' | tee /etc/apt/preferences.d/mozilla > /dev/null && \
2433
apt-get update -qqy && \
2534
apt-get -qy install firefox google-chrome-stable && \
2635
dpkg -r --force-depends firefox google-chrome-stable && \

scripts/remote-image/create-cc-toolchain-within-image.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set -eux -o pipefail
55
apt-get update
66
apt-get install -qy ca-certificates curl
77

8-
curl -L -o /usr/bin/bazel https://github.com/bazelbuild/bazelisk/releases/download/v1.16.0/bazelisk-linux-amd64
8+
curl -L -o /usr/bin/bazel https://github.com/bazelbuild/bazelisk/releases/download/v1.25.0/bazelisk-linux-amd64
99
chmod +x /usr/bin/bazel
1010

1111
temp="$(mktemp -d)"

0 commit comments

Comments
 (0)