Merge branch 'SeleniumHQ:trunk' into py-fix-proxy-auth-special-chars

Author: cgoldberg

py/BUILD.bazel

@@ -441,7 +441,8 @@ BIDI_TESTS = glob(["test/selenium/webdriver/common/**/*bidi*_tests.py"])
                 "test/selenium/webdriver/common/**/*.py",
                 "test/selenium/webdriver/support/**/*.py",
             ],
-            exclude = BIDI_TESTS + ["test/selenium/webdriver/common/print_pdf_tests.py"],
+            exclude = BIDI_TESTS + ["test/selenium/webdriver/common/print_pdf_tests.py"] +
+                      (["test/selenium/webdriver/common/devtools_tests.py"] if browser == "chrome-beta" else []),
         ),
         args = [
             "--instafail",
@@ -467,7 +468,8 @@ BIDI_TESTS = glob(["test/selenium/webdriver/common/**/*bidi*_tests.py"])
                 "test/selenium/webdriver/common/**/*.py",
                 "test/selenium/webdriver/support/**/*.py",
             ],
-            exclude = ["test/selenium/webdriver/common/print_pdf_tests.py"],
+            exclude = ["test/selenium/webdriver/common/print_pdf_tests.py"] +
+                      (["test/selenium/webdriver/common/devtools_tests.py"] if browser == "chrome-beta" else []),
         ),
         args = [
             "--instafail",
@@ -534,6 +536,29 @@ py_test_suite(
     ] + TEST_DEPS,
 )
 
+py_test_suite(
+    name = "test-chrome-beta",
+    size = "large",
+    srcs = glob(
+        [
+            "test/selenium/webdriver/chrome/**/*.py",
+        ],
+    ),
+    args = [
+        "--instafail",
+    ] + BROWSERS["chrome-beta"]["args"],
+    data = BROWSERS["chrome-beta"]["data"],
+    env_inherit = ["DISPLAY"],
+    tags = [
+        "no-sandbox",
+    ] + BROWSERS["chrome-beta"]["tags"],
+    deps = [
+        ":init-tree",
+        ":selenium",
+        ":webserver",
+    ] + TEST_DEPS,
+)
+
 py_test_suite(
     name = "test-edge",
     size = "large",

py/private/browsers.bzl

@@ -1,6 +1,7 @@
 load(
     "//common:browsers.bzl",
     "COMMON_TAGS",
+    "chrome_beta_data",
     "chrome_data",
     "edge_data",
     "firefox_data",
@@ -27,6 +28,20 @@ chrome_args = select({
     "//conditions:default": [],
 }) + headless_args
 
+chrome_beta_args = select({
+    "@selenium//common:use_pinned_linux_chrome": [
+        "--driver-binary=$(location @linux_beta_chromedriver//:chromedriver)",
+        "--browser-binary=$(location @linux_beta_chrome//:chrome-linux64/chrome)",
+        "--browser-args=--disable-dev-shm-usage",
+        "--browser-args=--no-sandbox",
+    ],
+    "@selenium//common:use_pinned_macos_chrome": [
+        "--driver-binary=$(location @mac_beta_chromedriver//:chromedriver)",
+        "--browser-binary=$(location @mac_beta_chrome//:Chrome.app)/Contents/MacOS/Chrome",
+    ],
+    "//conditions:default": [],
+}) + headless_args
+
 edge_args = select({
     "@selenium//common:use_pinned_linux_edge": [
         "--driver-binary=$(location @linux_edgedriver//:msedgedriver)",
@@ -59,6 +74,11 @@ BROWSERS = {
         "data": chrome_data,
         "tags": COMMON_TAGS + ["chrome"],
     },
+    "chrome-beta": {
+        "args": ["--driver=chrome"] + chrome_beta_args,
+        "data": chrome_beta_data,
+        "tags": COMMON_TAGS + ["chrome"],
+    },
     "edge": {
         "args": ["--driver=edge"] + edge_args,
         "data": edge_data,