Skip to content

Commit 07bc7c9

Browse files
committed
[py] generate -bidi test targets for bidi tests only
1 parent c1ffd8c commit 07bc7c9

1 file changed

Lines changed: 6 additions & 69 deletions

File tree

py/BUILD.bazel

Lines changed: 6 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -778,6 +778,9 @@ py_library(
778778

779779
BIDI_TESTS = glob(["test/selenium/webdriver/common/**/*bidi*_tests.py"])
780780

781+
# Tests that have bidi and classic implementations.
782+
BIDI_IMPLEMENTATIONS = []
783+
781784
# Test files that only run against browsers supporting the given feature.
782785
# Each group is split into its own sub-suite so that changing the underlying
783786
# library only triggers that group's targets, not the full ~700-target suite.
@@ -989,19 +992,12 @@ FEATURE_SUITE_DEFS = {
989992
] + [":test-%s-%s" % (browser, f) for f in FEATURE_SUITE_DEFS],
990993
) for browser in DEFAULT_BROWSER_TESTS]
991994

992-
# Generate test-<browser>-bidi-common targets
995+
# Generate test-<browser>-bidi targets
993996
[
994997
py_test_suite(
995-
name = "test-%s-bidi-common" % browser,
998+
name = "test-%s-bidi" % browser,
996999
size = "large",
997-
srcs = glob(
998-
[
999-
"test/selenium/webdriver/common/**/*.py",
1000-
"test/selenium/webdriver/support/**/*.py",
1001-
] + BROWSER_TESTS[browser]["browser_srcs"],
1002-
exclude = ACTIONS_TESTS + FEATURE_TESTS + ["test/selenium/webdriver/common/print_pdf_tests.py"] +
1003-
BROWSER_TESTS[browser].get("extra_excludes", []),
1004-
),
1000+
srcs = BIDI_TESTS + BIDI_IMPLEMENTATIONS,
10051001
args = [
10061002
"--instafail",
10071003
"--bidi",
@@ -1021,65 +1017,6 @@ FEATURE_SUITE_DEFS = {
10211017
if BROWSER_TESTS[browser].get("bidi", False)
10221018
]
10231019

1024-
# Generate test-<browser>-bidi-actions targets
1025-
[
1026-
py_test_suite(
1027-
name = "test-%s-bidi-actions" % browser,
1028-
size = "large",
1029-
srcs = ACTIONS_TESTS,
1030-
args = [
1031-
"--instafail",
1032-
"--bidi",
1033-
] + BROWSERS[browser]["args"],
1034-
data = BROWSERS[browser]["data"],
1035-
env_inherit = ["DISPLAY"],
1036-
tags = ["no-sandbox"] + BROWSERS[browser]["tags"],
1037-
target_compatible_with = BROWSERS[browser]["target_compatible_with"],
1038-
test_suffix = "%s-bidi-actions" % browser,
1039-
deps = [
1040-
":init-tree",
1041-
":webserver",
1042-
] + BROWSER_TESTS[browser]["actions_deps"] + TEST_DEPS,
1043-
)
1044-
for browser in DEFAULT_BROWSER_TESTS
1045-
if BROWSER_TESTS[browser].get("bidi", False)
1046-
]
1047-
1048-
# Generate test-<browser>-bidi-<feature> targets
1049-
[
1050-
py_test_suite(
1051-
name = "test-%s-bidi-%s" % (browser, feature),
1052-
size = "large",
1053-
srcs = FEATURE_SUITE_DEFS[feature][0],
1054-
args = [
1055-
"--instafail",
1056-
"--bidi",
1057-
] + BROWSERS[browser]["args"],
1058-
data = BROWSERS[browser]["data"],
1059-
env_inherit = ["DISPLAY"],
1060-
tags = ["no-sandbox"] + BROWSERS[browser]["tags"],
1061-
target_compatible_with = BROWSERS[browser]["target_compatible_with"],
1062-
test_suffix = "%s-bidi-%s" % (browser, feature),
1063-
deps = [
1064-
":init-tree",
1065-
":webserver",
1066-
FEATURE_SUITE_DEFS[feature][1],
1067-
] + BROWSER_TESTS[browser]["deps"] + TEST_DEPS,
1068-
)
1069-
for browser in DEFAULT_BROWSER_TESTS
1070-
for feature in FEATURE_SUITE_DEFS
1071-
if BROWSER_TESTS[browser].get("bidi", False)
1072-
]
1073-
1074-
# Aggregate test-<browser>-bidi = bidi-common + bidi-actions + bidi-features
1075-
[test_suite(
1076-
name = "test-%s-bidi" % browser,
1077-
tests = [
1078-
":test-%s-bidi-common" % browser,
1079-
":test-%s-bidi-actions" % browser,
1080-
] + [":test-%s-bidi-%s" % (browser, f) for f in FEATURE_SUITE_DEFS],
1081-
) for browser in DEFAULT_BROWSER_TESTS if BROWSER_TESTS[browser].get("bidi", False)]
1082-
10831020
# Generate test-<browser>-remote-common targets (chrome and firefox only)
10841021
[
10851022
py_test_suite(

0 commit comments

Comments
 (0)