Merge pull request #2495 from cloudflare/ggu/refactor-bazel-test

src/workerd/server/tests/python/BUILD.bazel

@@ -1,67 +1,61 @@
 load("//:build/wd_test.bzl", "wd_test")
 
+load("//src/workerd/server/tests/python:py_wd_test.bzl", "py_wd_test")
+
 load("@bazel_skylib//rules:copy_file.bzl", "copy_file")
 
+# pyodide-dev.capnp.bin represents a custom pyodide version "dev" that is generated
+# at build time using the latest contents of the src/pyodide directory.
+# This is used to run tests to ensure that they are always run against the latest build of
+# the Pyodide bundle.
 copy_file(
     name = "pyodide-dev.capnp.bin@rule",
     src = "//src/pyodide:pyodide.capnp.bin",
     out = "pyodide-bundle-cache/pyodide-dev.capnp.bin"
 )
 
-wd_test(
+py_wd_test(
     src = "hello/hello.wd-test",
-    args = ["--experimental", "--pyodide-bundle-disk-cache-dir", "$(location pyodide-dev.capnp.bin@rule)/.."],
+    args = ["--experimental"],
     data = glob(
         [
             "hello/*",
         ],
         exclude = ["**/*.wd-test"],
-    ) + ["pyodide-dev.capnp.bin@rule"],
+    ),
 )
 
-wd_test(
+py_wd_test(
     src = "env-param/env.wd-test",
-    args = ["--experimental", "--pyodide-bundle-disk-cache-dir", "$(location pyodide-dev.capnp.bin@rule)/.."],
+    args = ["--experimental"],
     data = glob(
         [
             "env-param/*",
         ],
         exclude = ["**/*.wd-test"],
-    ) + ["pyodide-dev.capnp.bin@rule"],
+    ),
 )
 
-wd_test(
+py_wd_test(
     src = "random/random.wd-test",
-    args = ["--experimental", "--pyodide-bundle-disk-cache-dir", "$(location pyodide-dev.capnp.bin@rule)/.."],
+    args = ["--experimental"],
     data = glob(
         [
             "random/*",
         ],
         exclude = ["**/*.wd-test"],
-    ) + ["pyodide-dev.capnp.bin@rule"],
+    ),
 )
 
-# Disabled because it tests the same thing as the import test defined in import_tests.bzl
-# wd_test(
-#     src = "langchain/langchain.wd-test",
-#     args = ["--experimental", "--pyodide-package-disk-cache-dir", "../all_pyodide_wheels", "--pyodide-bundle-disk-cache-dir", "$(location pyodide-dev.capnp.bin@rule)/.."],
-#     data = glob(
-#         [
-#             "langchain/*",
-#         ],
-#         exclude = ["**/*.wd-test"],
-#     ) + ["@all_pyodide_wheels//:whls", "pyodide-dev.capnp.bin@rule"],
-# )
-
-wd_test(
+py_wd_test(
     src = "subdirectory/subdirectory.wd-test",
-    args = ["--experimental", "--pyodide-bundle-disk-cache-dir", "$(location pyodide-dev.capnp.bin@rule)/.."],
+    args = ["--experimental"],
     data = glob(
         [
             "subdirectory/**",
         ],
         exclude = ["**/*.wd-test"],
-    ) + ["pyodide-dev.capnp.bin@rule"],
+    ),
 )
 
 load("//src/workerd/server/tests/python:import_tests.bzl", "gen_import_tests")

src/workerd/server/tests/python/import_tests.bzl

@@ -1,6 +1,6 @@
 load("@bazel_skylib//rules:write_file.bzl", "write_file")
 
-load("//:build/wd_test.bzl", "wd_test")
+load("//src/workerd/server/tests/python:py_wd_test.bzl", "py_wd_test")
 
 def generate_import_py_file(imports):
   res = ""
@@ -54,9 +54,9 @@ def gen_import_tests(to_test):
       tags = ["slow"],
     )
 
-    wd_test(
+    py_wd_test(
       src = wd_test_fname,
-      args = ["--experimental", "--pyodide-package-disk-cache-dir", "../all_pyodide_wheels", "--pyodide-bundle-disk-cache-dir", "$(location pyodide-dev.capnp.bin@rule)/.."],
-      data = [worker_py_fname, "@all_pyodide_wheels//:whls", "pyodide-dev.capnp.bin@rule"],
+      args = ["--experimental", "--pyodide-package-disk-cache-dir", "../all_pyodide_wheels"],
+      data = [worker_py_fname, "@all_pyodide_wheels//:whls"],
       tags = ["slow"],
     )

src/workerd/server/tests/python/py_wd_test.bzl

@@ -0,0 +1,19 @@
+load("//:build/wd_test.bzl", "wd_test")
+
+def py_wd_test(
+  src,
+  data = [],
+  name = None,
+  args = [],
+  **kwargs
+):
+    data += ["pyodide-dev.capnp.bin@rule"]
+    args += ["--pyodide-bundle-disk-cache-dir", "$(location pyodide-dev.capnp.bin@rule)/.."]
+
+    wd_test(
+        src = src,
+        data = data,
+        name = name,
+        args = args,
+        **kwargs
+    )