Skip to content

Commit 8f8bf8e

Browse files
committed
[java] Remove firefox-dev tests
Per #11305
1 parent 1aa091e commit 8f8bf8e

File tree

6 files changed

+1
-69
lines changed

6 files changed

+1
-69
lines changed

.skipped-tests

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
-//javascript/atoms:test-chrome
3333
-//javascript/atoms:test-edge
3434
-//javascript/atoms:test-firefox-beta
35-
-//javascript/atoms:test-firefox-dev
3635
-//py:common-chrome-test/selenium/webdriver/common/virtual_authenticator_tests.py
3736
-//py:test-chrome-test/selenium/webdriver/chrome/chrome_launcher_tests.py
3837
-//py:test-chrome-test/selenium/webdriver/chrome/chrome_service_tests.py

common/browsers.bzl

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -83,14 +83,3 @@ firefox_beta_data = select({
8383
],
8484
"//conditions:default": [],
8585
}) + geckodriver_data
86-
87-
firefox_dev_data = select({
88-
"@selenium//common:use_pinned_linux_firefox": [
89-
"@linux_dev_firefox//:files",
90-
"@linux_dev_firefox//:firefox/firefox",
91-
],
92-
"@selenium//common:use_pinned_macos_firefox": [
93-
"@mac_dev_firefox//:Firefox.app",
94-
],
95-
"//conditions:default": [],
96-
}) + geckodriver_data

common/repositories.bzl

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -57,30 +57,6 @@ exports_files(
5757
build_file_content = "exports_files([\"Firefox.app\"])",
5858
)
5959

60-
http_archive(
61-
name = "linux_dev_firefox",
62-
url = "https://ftp.mozilla.org/pub/firefox/releases/124.0b9/linux-x86_64/en-US/firefox-124.0b9.tar.bz2",
63-
sha256 = "80208d269dc8d251a7f9f292a7a6ea9ad217189a01075ff6d77326cb0352c1db",
64-
build_file_content = """
65-
filegroup(
66-
name = "files",
67-
srcs = glob(["**/*"]),
68-
visibility = ["//visibility:public"],
69-
)
70-
71-
exports_files(
72-
["firefox/firefox"],
73-
)
74-
""",
75-
)
76-
77-
dmg_archive(
78-
name = "mac_dev_firefox",
79-
url = "https://ftp.mozilla.org/pub/firefox/releases/124.0b9/mac/en-US/Firefox%20124.0b9.dmg",
80-
sha256 = "c716240f5fd76937cccbe93e9ffdb681782fbacb9af1face7416351a6e71a1a3",
81-
build_file_content = "exports_files([\"Firefox.app\"])",
82-
)
83-
8460
http_archive(
8561
name = "linux_geckodriver",
8662
url = "https://github.com/mozilla/geckodriver/releases/download/v0.34.0/geckodriver-v0.34.0-linux64.tar.gz",

java/browsers.bzl

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -99,21 +99,3 @@ firefox_beta_jvm_flags = select({
9999
],
100100
"//conditions:default": [],
101101
}) + geckodriver_jvm_flags
102-
103-
firefox_dev_jvm_flags = select({
104-
"@selenium//common:use_pinned_linux_firefox": [
105-
"-Dwebdriver.firefox.bin=$(location @linux_dev_firefox//:firefox/firefox)",
106-
],
107-
"@selenium//common:use_pinned_macos_firefox": [
108-
"-Dwebdriver.firefox.bin=$(location @mac_dev_firefox//:Firefox.app)/Contents/MacOS/firefox",
109-
],
110-
"@selenium//common:use_local_geckodriver": [],
111-
"//conditions:default": [
112-
"-Dselenium.skiptest=false",
113-
],
114-
}) + select({
115-
"@selenium//common:use_headless_browser": [
116-
"-Dwebdriver.headless=true",
117-
],
118-
"//conditions:default": [],
119-
}) + geckodriver_jvm_flags

java/private/selenium_test.bzl

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,12 @@ load(
55
"edge_data",
66
"firefox_beta_data",
77
"firefox_data",
8-
"firefox_dev_data",
98
)
109
load(
1110
"//java:browsers.bzl",
1211
"chrome_jvm_flags",
1312
"edge_jvm_flags",
1413
"firefox_beta_jvm_flags",
15-
"firefox_dev_jvm_flags",
1614
"firefox_jvm_flags",
1715
)
1816
load(":junit5_test.bzl", "junit5_test")
@@ -44,12 +42,6 @@ BROWSERS = {
4442
"data": firefox_beta_data,
4543
"tags": COMMON_TAGS + ["firefox", "firefox-beta"],
4644
},
47-
"firefox-dev": {
48-
"deps": ["//java/src/org/openqa/selenium/firefox"],
49-
"jvm_flags": ["-Dselenium.browser=ff"] + firefox_dev_jvm_flags,
50-
"data": firefox_dev_data,
51-
"tags": COMMON_TAGS + ["firefox", "firefox-dev"],
52-
},
5345
"ie": {
5446
"deps": ["//java/src/org/openqa/selenium/ie"],
5547
"jvm_flags": ["-Dselenium.browser=ie"] +

scripts/pinned_browsers.py

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -298,13 +298,7 @@ def firefox():
298298
if latest_firefox != beta_firefox:
299299
sha_linux = calculate_hash(firefox_linux(beta_firefox))
300300
sha_mac = calculate_hash(firefox_mac(beta_firefox))
301-
content = content + print_firefox(beta_firefox, "beta_", sha_linux, sha_mac)
302-
303-
dev_firefox = firefox_versions["FIREFOX_DEVEDITION"]
304-
if beta_firefox != dev_firefox:
305-
sha_linux = calculate_hash(firefox_linux(dev_firefox))
306-
sha_mac = calculate_hash(firefox_mac(dev_firefox))
307-
return content + print_firefox(dev_firefox, "dev_", sha_linux, sha_mac)
301+
return content + print_firefox(beta_firefox, "beta_", sha_linux, sha_mac)
308302

309303

310304
def firefox_version_data():

0 commit comments

Comments
 (0)