Skip to content

Commit

Permalink
[java] Remove firefox-dev tests
Browse files Browse the repository at this point in the history
Per #11305
  • Loading branch information
p0deje committed Mar 15, 2024
1 parent 1aa091e commit 8f8bf8e
Show file tree
Hide file tree
Showing 6 changed files with 1 addition and 69 deletions.
1 change: 0 additions & 1 deletion .skipped-tests
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
-//javascript/atoms:test-chrome
-//javascript/atoms:test-edge
-//javascript/atoms:test-firefox-beta
-//javascript/atoms:test-firefox-dev
-//py:common-chrome-test/selenium/webdriver/common/virtual_authenticator_tests.py
-//py:test-chrome-test/selenium/webdriver/chrome/chrome_launcher_tests.py
-//py:test-chrome-test/selenium/webdriver/chrome/chrome_service_tests.py
Expand Down
11 changes: 0 additions & 11 deletions common/browsers.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -83,14 +83,3 @@ firefox_beta_data = select({
],
"//conditions:default": [],
}) + geckodriver_data

firefox_dev_data = select({
"@selenium//common:use_pinned_linux_firefox": [
"@linux_dev_firefox//:files",
"@linux_dev_firefox//:firefox/firefox",
],
"@selenium//common:use_pinned_macos_firefox": [
"@mac_dev_firefox//:Firefox.app",
],
"//conditions:default": [],
}) + geckodriver_data
24 changes: 0 additions & 24 deletions common/repositories.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -57,30 +57,6 @@ exports_files(
build_file_content = "exports_files([\"Firefox.app\"])",
)

http_archive(
name = "linux_dev_firefox",
url = "https://ftp.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/en-US/firefox-124.0b9.tar.bz2",
sha256 = "80208d269dc8d251a7f9f292a7a6ea9ad217189a01075ff6d77326cb0352c1db",
build_file_content = """
filegroup(
name = "files",
srcs = glob(["**/*"]),
visibility = ["//visibility:public"],
)
exports_files(
["firefox/firefox"],
)
""",
)

dmg_archive(
name = "mac_dev_firefox",
url = "https://ftp.mozilla.org/pub/firefox/releases/124.0b9/mac/en-US/Firefox%20124.0b9.dmg",
sha256 = "c716240f5fd76937cccbe93e9ffdb681782fbacb9af1face7416351a6e71a1a3",
build_file_content = "exports_files([\"Firefox.app\"])",
)

http_archive(
name = "linux_geckodriver",
url = "https://github.com/mozilla/geckodriver/releases/download/v0.34.0/geckodriver-v0.34.0-linux64.tar.gz",
Expand Down
18 changes: 0 additions & 18 deletions java/browsers.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -99,21 +99,3 @@ firefox_beta_jvm_flags = select({
],
"//conditions:default": [],
}) + geckodriver_jvm_flags

firefox_dev_jvm_flags = select({
"@selenium//common:use_pinned_linux_firefox": [
"-Dwebdriver.firefox.bin=$(location @linux_dev_firefox//:firefox/firefox)",
],
"@selenium//common:use_pinned_macos_firefox": [
"-Dwebdriver.firefox.bin=$(location @mac_dev_firefox//:Firefox.app)/Contents/MacOS/firefox",
],
"@selenium//common:use_local_geckodriver": [],
"//conditions:default": [
"-Dselenium.skiptest=false",
],
}) + select({
"@selenium//common:use_headless_browser": [
"-Dwebdriver.headless=true",
],
"//conditions:default": [],
}) + geckodriver_jvm_flags
8 changes: 0 additions & 8 deletions java/private/selenium_test.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,12 @@ load(
"edge_data",
"firefox_beta_data",
"firefox_data",
"firefox_dev_data",
)
load(
"//java:browsers.bzl",
"chrome_jvm_flags",
"edge_jvm_flags",
"firefox_beta_jvm_flags",
"firefox_dev_jvm_flags",
"firefox_jvm_flags",
)
load(":junit5_test.bzl", "junit5_test")
Expand Down Expand Up @@ -44,12 +42,6 @@ BROWSERS = {
"data": firefox_beta_data,
"tags": COMMON_TAGS + ["firefox", "firefox-beta"],
},
"firefox-dev": {
"deps": ["//java/src/org/openqa/selenium/firefox"],
"jvm_flags": ["-Dselenium.browser=ff"] + firefox_dev_jvm_flags,
"data": firefox_dev_data,
"tags": COMMON_TAGS + ["firefox", "firefox-dev"],
},
"ie": {
"deps": ["//java/src/org/openqa/selenium/ie"],
"jvm_flags": ["-Dselenium.browser=ie"] +
Expand Down
8 changes: 1 addition & 7 deletions scripts/pinned_browsers.py
Original file line number Diff line number Diff line change
Expand Up @@ -298,13 +298,7 @@ def firefox():
if latest_firefox != beta_firefox:
sha_linux = calculate_hash(firefox_linux(beta_firefox))
sha_mac = calculate_hash(firefox_mac(beta_firefox))
content = content + print_firefox(beta_firefox, "beta_", sha_linux, sha_mac)

dev_firefox = firefox_versions["FIREFOX_DEVEDITION"]
if beta_firefox != dev_firefox:
sha_linux = calculate_hash(firefox_linux(dev_firefox))
sha_mac = calculate_hash(firefox_mac(dev_firefox))
return content + print_firefox(dev_firefox, "dev_", sha_linux, sha_mac)
return content + print_firefox(beta_firefox, "beta_", sha_linux, sha_mac)


def firefox_version_data():
Expand Down

0 comments on commit 8f8bf8e

Please sign in to comment.