Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[py] Fix TypeError when init Safari webdriver #14699

Merged
merged 3 commits into from
Nov 1, 2024
Merged

[py] Fix TypeError when init Safari webdriver #14699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e520548
[py] Fix TypeError when init Safari webdriver
VietND96 Oct 31, 2024
1d66b1b
Try to enable test safari in CI
VietND96 Oct 31, 2024
0852525
Merge branch 'trunk' into safari-driver
VietND96 Nov 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions .github/workflows/ci-python.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,3 +86,15 @@ jobs:
browser: firefox
cache-key: py-remote
run: bazel test --local_test_jobs 1 --flaky_test_attempts 3 //py:test-remote

safari-tests:
name: Safari Tests
needs: build
uses: ./.github/workflows/bazel.yml
with:
name: Integration Tests (safari)
browser: safari
os: macos
cache-key: py-safari
run: |
bazel test --local_test_jobs 1 --flaky_test_attempts 3 //py:test-safari-test/selenium/webdriver/safari/launcher_tests.py
5 changes: 2 additions & 3 deletions py/selenium/webdriver/safari/webdriver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
# under the License.

from selenium.common.exceptions import WebDriverException
from selenium.webdriver.remote.client_config import ClientConfig
from selenium.webdriver.remote.webdriver import WebDriver as RemoteWebDriver

from ..common.driver_finder import DriverFinder
Expand Down Expand Up @@ -51,10 +50,10 @@ def __init__(
if not self.service.reuse_service:
self.service.start()

client_config = ClientConfig(remote_server_addr=self.service.service_url, keep_alive=keep_alive, timeout=120)
executor = SafariRemoteConnection(
remote_server_addr=self.service.service_url,
keep_alive=keep_alive,
ignore_proxy=options._ignore_local_proxy,
client_config=client_config,
)

try:
Expand Down
1 change: 1 addition & 0 deletions py/test/selenium/webdriver/safari/launcher_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ def test_launch(self, driver):
assert driver.capabilities["browserName"] == "safari"


@pytest.mark.skip(reason="Need to be updated")
def test_launch_safari_with_legacy_flag(mocker, driver_class):
import subprocess

Expand Down
Loading