@@ -778,6 +778,9 @@ py_library(
778778
779779BIDI_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.
@@ -1013,19 +1016,12 @@ FEATURE_SUITE_DEFS = {
10131016 for browser in DEFAULT_BROWSER_TESTS
10141017]
10151018
1016- # Generate test-<browser>-bidi-common targets
1019+ # Generate test-<browser>-bidi targets
10171020[
10181021 py_test_suite (
1019- name = "test-%s-bidi-common " % browser ,
1022+ name = "test-%s-bidi" % browser ,
10201023 size = "large" ,
1021- srcs = glob (
1022- [
1023- "test/selenium/webdriver/common/**/*.py" ,
1024- "test/selenium/webdriver/support/**/*.py" ,
1025- ] + BROWSER_TESTS [browser ]["browser_srcs" ],
1026- exclude = ACTIONS_TESTS + FEATURE_TESTS + DRIVER_FINDER_TESTS + ["test/selenium/webdriver/common/print_pdf_tests.py" ] +
1027- BROWSER_TESTS [browser ].get ("extra_excludes" , []),
1028- ),
1024+ srcs = BIDI_TESTS + BIDI_IMPLEMENTATIONS ,
10291025 args = [
10301026 "--instafail" ,
10311027 "--bidi" ,
@@ -1045,65 +1041,6 @@ FEATURE_SUITE_DEFS = {
10451041 if BROWSER_TESTS [browser ].get ("bidi" , False )
10461042]
10471043
1048- # Generate test-<browser>-bidi-actions targets
1049- [
1050- py_test_suite (
1051- name = "test-%s-bidi-actions" % browser ,
1052- size = "large" ,
1053- srcs = ACTIONS_TESTS ,
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-actions" % browser ,
1063- deps = [
1064- ":init-tree" ,
1065- ":webserver" ,
1066- ] + BROWSER_TESTS [browser ]["actions_deps" ] + TEST_DEPS ,
1067- )
1068- for browser in DEFAULT_BROWSER_TESTS
1069- if BROWSER_TESTS [browser ].get ("bidi" , False )
1070- ]
1071-
1072- # Generate test-<browser>-bidi-<feature> targets
1073- [
1074- py_test_suite (
1075- name = "test-%s-bidi-%s" % (browser , feature ),
1076- size = "large" ,
1077- srcs = FEATURE_SUITE_DEFS [feature ][0 ],
1078- args = [
1079- "--instafail" ,
1080- "--bidi" ,
1081- ] + BROWSERS [browser ]["args" ],
1082- data = BROWSERS [browser ]["data" ],
1083- env_inherit = ["DISPLAY" ],
1084- tags = ["no-sandbox" ] + BROWSERS [browser ]["tags" ],
1085- target_compatible_with = BROWSERS [browser ]["target_compatible_with" ],
1086- test_suffix = "%s-bidi-%s" % (browser , feature ),
1087- deps = [
1088- ":init-tree" ,
1089- ":webserver" ,
1090- FEATURE_SUITE_DEFS [feature ][1 ],
1091- ] + BROWSER_TESTS [browser ]["deps" ] + TEST_DEPS ,
1092- )
1093- for browser in DEFAULT_BROWSER_TESTS
1094- for feature in FEATURE_SUITE_DEFS
1095- if BROWSER_TESTS [browser ].get ("bidi" , False )
1096- ]
1097-
1098- # Aggregate test-<browser>-bidi = bidi-common + bidi-actions + bidi-features
1099- [test_suite (
1100- name = "test-%s-bidi" % browser ,
1101- tests = [
1102- ":test-%s-bidi-common" % browser ,
1103- ":test-%s-bidi-actions" % browser ,
1104- ] + [":test-%s-bidi-%s" % (browser , f ) for f in FEATURE_SUITE_DEFS ],
1105- ) for browser in DEFAULT_BROWSER_TESTS if BROWSER_TESTS [browser ].get ("bidi" , False )]
1106-
11071044# Generate test-<browser>-remote-common targets (chrome and firefox only)
11081045[
11091046 py_test_suite (
0 commit comments