Skip to content

Commit 65ca57a

Browse files
committed
[py+ci] Get closer to getting all the python tests running on EngFlow
1 parent e648db8 commit 65ca57a

File tree

3 files changed

+23
-7
lines changed

3 files changed

+23
-7
lines changed

.bazelrc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,8 @@ build:remote --incompatible_enable_cc_toolchain_resolution
114114
build:remote --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
115115
test:remote --test_env=DISPLAY=:99.0
116116
test:remote --test_tag_filters=-edge,-safari,-remote
117+
# Skip tests that we mark specifically as being unable to run on the rbe
118+
test:remote --test_tag_filters=-no-rbe
117119

118120
# Env vars we can hard code
119121
build:remote --action_env=HOME=/home/dev

py/BUILD.bazel

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ compile_pip_requirements(
1414
name = "requirements",
1515
requirements_in = ":requirements.txt",
1616
requirements_txt = ":requirements_lock.txt",
17+
tags = [
18+
"no-rbe",
19+
],
1720
)
1821

1922
SE_VERSION = "4.10.0"
@@ -352,10 +355,12 @@ py_test_suite(
352355
args = [
353356
"--instafail",
354357
"--driver=chrome",
355-
],
358+
] + BROWSERS["chrome"]["args"],
359+
data = BROWSERS["chrome"]["data"],
360+
env_inherit = ["DISPLAY"],
356361
tags = [
357362
"no-sandbox",
358-
],
363+
] + BROWSERS["chrome"]["tags"],
359364
deps = [
360365
":init-tree",
361366
":selenium",
@@ -379,6 +384,7 @@ py_test_suite(
379384
"--headless=true",
380385
],
381386
tags = [
387+
"no-rbe",
382388
"no-sandbox",
383389
],
384390
deps = [
@@ -401,6 +407,7 @@ py_test_suite(
401407
"--driver=edge",
402408
],
403409
tags = [
410+
"no-rbe",
404411
"no-sandbox",
405412
],
406413
deps = [
@@ -422,10 +429,12 @@ py_test_suite(
422429
args = [
423430
"--instafail",
424431
"--driver=firefox",
425-
],
432+
] + BROWSERS["firefox"]["args"],
433+
data = BROWSERS["firefox"]["data"],
434+
env_inherit = ["DISPLAY"],
426435
tags = [
427436
"no-sandbox",
428-
],
437+
] + BROWSERS["firefox"]["tags"],
429438
deps = [
430439
":init-tree",
431440
":selenium",
@@ -448,6 +457,7 @@ py_test_suite(
448457
"//java/src/org/openqa/selenium/grid:selenium_server_deploy.jar",
449458
],
450459
tags = [
460+
"no-rbe",
451461
"no-sandbox",
452462
],
453463
deps = [
@@ -470,6 +480,7 @@ py_test_suite(
470480
"--driver=ie",
471481
],
472482
tags = [
483+
"no-rbe",
473484
"no-sandbox",
474485
],
475486
deps = [
@@ -493,6 +504,7 @@ py_test_suite(
493504
],
494505
tags = [
495506
"exclusive-if-local",
507+
"no-rbe",
496508
"no-sandbox",
497509
],
498510
deps = [
@@ -517,6 +529,7 @@ py_test_suite(
517529
],
518530
tags = [
519531
"exclusive-if-local",
532+
"no-rbe",
520533
"no-sandbox",
521534
],
522535
deps = [
@@ -541,6 +554,7 @@ py_test_suite(
541554
],
542555
tags = [
543556
"exclusive-if-local",
557+
"no-rbe",
544558
"no-sandbox",
545559
],
546560
deps = [

py/private/browsers.bzl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ BROWSERS = {
6565
"edge": {
6666
"args": ["--driver=edge"] + edge_args,
6767
"data": edge_data,
68-
"tags": COMMON_TAGS + ["edge"],
68+
"tags": COMMON_TAGS + ["edge", "no-rbe"],
6969
},
7070
"firefox": {
7171
"args": ["--driver=firefox"] + firefox_args,
@@ -75,11 +75,11 @@ BROWSERS = {
7575
"ie": {
7676
"args": ["--driver=ie"],
7777
"data": [],
78-
"tags": COMMON_TAGS + ["ie"],
78+
"tags": COMMON_TAGS + ["ie", "no-rbe"],
7979
},
8080
"safari": {
8181
"args": ["--driver=safari"],
8282
"data": [],
83-
"tags": COMMON_TAGS + ["safari"],
83+
"tags": COMMON_TAGS + ["safari", "no-rbe"],
8484
},
8585
}

0 commit comments

Comments
 (0)