Skip to content

Commit 2736da0

Browse files
committed
Reduce repeated code in Python test setup
1 parent 7d0e7cd commit 2736da0

File tree

2 files changed

+21
-45
lines changed

2 files changed

+21
-45
lines changed

Diff for: src/workerd/server/tests/python/BUILD.bazel

+7-43
Original file line numberDiff line numberDiff line change
@@ -15,73 +15,37 @@ copy_file(
1515
)
1616

1717
py_wd_test(
18-
src = "hello/hello.wd-test",
18+
"hello",
1919
args = ["--experimental"],
20-
data = glob(
21-
[
22-
"hello/*",
23-
],
24-
exclude = ["**/*.wd-test"],
25-
),
2620
)
2721

2822
py_wd_test(
29-
src = "sdk/sdk.wd-test",
23+
"sdk",
3024
args = ["--experimental"],
31-
data = glob(
32-
[
33-
"sdk/*",
34-
],
35-
exclude = ["**/*.wd-test"],
36-
),
3725
tags = [
3826
# TODO(someday): Fix asan failure for this, see https://github.com/cloudflare/workerd/pull/3140#discussion_r1858273318
3927
"no-asan",
4028
],
4129
)
4230

4331
py_wd_test(
44-
src = "env-param/env.wd-test",
32+
"env-param",
4533
args = ["--experimental"],
46-
data = glob(
47-
[
48-
"env-param/*",
49-
],
50-
exclude = ["**/*.wd-test"],
51-
),
5234
)
5335

5436
py_wd_test(
55-
src = "asgi/asgi.wd-test",
37+
"asgi",
5638
args = ["--experimental"],
57-
data = glob(
58-
[
59-
"asgi/*",
60-
],
61-
exclude = ["**/*.wd-test"],
62-
),
6339
)
6440

6541
py_wd_test(
66-
src = "random/random.wd-test",
42+
"random",
6743
args = ["--experimental"],
68-
data = glob(
69-
[
70-
"random/*",
71-
],
72-
exclude = ["**/*.wd-test"],
73-
),
7444
)
7545

7646
py_wd_test(
77-
src = "subdirectory/subdirectory.wd-test",
47+
"subdirectory",
7848
args = ["--experimental"],
79-
data = glob(
80-
[
81-
"subdirectory/**",
82-
],
83-
exclude = ["**/*.wd-test"],
84-
),
8549
)
8650

87-
gen_import_tests(PYODIDE_IMPORTS_TO_TEST)
51+
# gen_import_tests(PYODIDE_IMPORTS_TO_TEST)

Diff for: src/workerd/server/tests/python/py_wd_test.bzl

+14-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,25 @@
11
load("//:build/wd_test.bzl", "wd_test")
22

33
def py_wd_test(
4-
src,
5-
data = [],
4+
directory = None,
5+
src = None,
6+
data = None,
67
name = None,
78
args = [],
89
size = "enormous",
910
tags = [],
1011
**kwargs):
12+
if data == None:
13+
data = native.glob(
14+
[
15+
directory + "/**",
16+
],
17+
exclude = ["**/*.wd-test"],
18+
)
19+
if src == None:
20+
src = native.glob([directory + "/*.wd-test"])[0]
21+
if name == None and directory != None:
22+
name = directory + "@"
1123
data += ["//src/workerd/server/tests/python:pyodide_dev.capnp.bin@rule"]
1224
args = args + ["--pyodide-bundle-disk-cache-dir", "$(location //src/workerd/server/tests/python:pyodide_dev.capnp.bin@rule)/..", "--experimental"]
1325

0 commit comments

Comments
 (0)