[py+ci] Get closer to getting all the python tests running on EngFlow

shs96c · shs96c · commit 65ca57a6004f · 2023-06-19T15:48:30.000+01:00
diff --git a/.bazelrc b/.bazelrc
@@ -114,6 +114,8 @@ build:remote --incompatible_enable_cc_toolchain_resolution
 build:remote --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
 test:remote --test_env=DISPLAY=:99.0
 test:remote --test_tag_filters=-edge,-safari,-remote
+# Skip tests that we mark specifically as being unable to run on the rbe
+test:remote --test_tag_filters=-no-rbe
 
 # Env vars we can hard code
 build:remote --action_env=HOME=/home/dev
diff --git a/py/BUILD.bazel b/py/BUILD.bazel
@@ -14,6 +14,9 @@ compile_pip_requirements(
     name = "requirements",
     requirements_in = ":requirements.txt",
     requirements_txt = ":requirements_lock.txt",
+    tags = [
+        "no-rbe",
+    ],
 )
 
 SE_VERSION = "4.10.0"
@@ -352,10 +355,12 @@ py_test_suite(
     args = [
         "--instafail",
         "--driver=chrome",
-    ],
+    ] + BROWSERS["chrome"]["args"],
+    data = BROWSERS["chrome"]["data"],
+    env_inherit = ["DISPLAY"],
     tags = [
         "no-sandbox",
-    ],
+    ] + BROWSERS["chrome"]["tags"],
     deps = [
         ":init-tree",
         ":selenium",
@@ -379,6 +384,7 @@ py_test_suite(
         "--headless=true",
     ],
     tags = [
+        "no-rbe",
         "no-sandbox",
     ],
     deps = [
@@ -401,6 +407,7 @@ py_test_suite(
         "--driver=edge",
     ],
     tags = [
+        "no-rbe",
         "no-sandbox",
     ],
     deps = [
@@ -422,10 +429,12 @@ py_test_suite(
     args = [
         "--instafail",
         "--driver=firefox",
-    ],
+    ] + BROWSERS["firefox"]["args"],
+    data = BROWSERS["firefox"]["data"],
+    env_inherit = ["DISPLAY"],
     tags = [
         "no-sandbox",
-    ],
+    ] + BROWSERS["firefox"]["tags"],
     deps = [
         ":init-tree",
         ":selenium",
@@ -448,6 +457,7 @@ py_test_suite(
         "//java/src/org/openqa/selenium/grid:selenium_server_deploy.jar",
     ],
     tags = [
+        "no-rbe",
         "no-sandbox",
     ],
     deps = [
@@ -470,6 +480,7 @@ py_test_suite(
         "--driver=ie",
     ],
     tags = [
+        "no-rbe",
         "no-sandbox",
     ],
     deps = [
@@ -493,6 +504,7 @@ py_test_suite(
     ],
     tags = [
         "exclusive-if-local",
+        "no-rbe",
         "no-sandbox",
     ],
     deps = [
@@ -517,6 +529,7 @@ py_test_suite(
     ],
     tags = [
         "exclusive-if-local",
+        "no-rbe",
         "no-sandbox",
     ],
     deps = [
@@ -541,6 +554,7 @@ py_test_suite(
     ],
     tags = [
         "exclusive-if-local",
+        "no-rbe",
         "no-sandbox",
     ],
     deps = [
diff --git a/py/private/browsers.bzl b/py/private/browsers.bzl
@@ -65,7 +65,7 @@ BROWSERS = {
     "edge": {
         "args": ["--driver=edge"] + edge_args,
         "data": edge_data,
-        "tags": COMMON_TAGS + ["edge"],
+        "tags": COMMON_TAGS + ["edge", "no-rbe"],
     },
     "firefox": {
         "args": ["--driver=firefox"] + firefox_args,
@@ -75,11 +75,11 @@ BROWSERS = {
     "ie": {
         "args": ["--driver=ie"],
         "data": [],
-        "tags": COMMON_TAGS + ["ie"],
+        "tags": COMMON_TAGS + ["ie", "no-rbe"],
     },
     "safari": {
         "args": ["--driver=safari"],
         "data": [],
-        "tags": COMMON_TAGS + ["safari"],
+        "tags": COMMON_TAGS + ["safari", "no-rbe"],
     },
 }
