Skip to content

Commit 954c16b

Browse files
committed
Fix several macOS CI tests by increasing timeout
Includes: - //src/test/py/bazel:bazel_external_repository_test - //src/test/py/bazel:bazel_overrides_test - //src/test/py/bazel:cc_import_test - //src/test/py/bazel:launcher_test - //src/test/shell/bazel:bazel_proto_library_test - //src/test/shell/bazel:bazel_strategy_test - //src/test/shell/bazel:cc_integration_test - //src/test/shell/bazel:check_external_files_test - //src/test/shell/bazel:starlark_git_repository_test - //src/test/shell/integration:client_test - //src/test/shell/integration:py_args_escaping_test - //src/test/shell/integration:stub_finds_runfiles_test - //src/test/shell/integration:test_test
1 parent 8a5bd6f commit 954c16b

3 files changed

Lines changed: 13 additions & 0 deletions

File tree

src/test/py/bazel/BUILD

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ py_test(
5656
py_test(
5757
name = "cc_import_test",
5858
size = "medium",
59+
timeout = "long",
5960
srcs = ["cc_import_test.py"],
6061
deps = [":test_base"],
6162
)
@@ -85,6 +86,7 @@ py_test(
8586
py_test(
8687
name = "bazel_external_repository_test",
8788
size = "medium",
89+
timeout = "long",
8890
srcs = ["bazel_external_repository_test.py"],
8991
data = glob(["testdata/bazel_external_repository_test/**"]),
9092
tags = [
@@ -150,6 +152,7 @@ py_test(
150152
py_test(
151153
name = "launcher_test",
152154
size = "medium",
155+
timeout = "long",
153156
srcs = ["launcher_test.py"],
154157
deps = [":test_base"],
155158
)
@@ -300,6 +303,7 @@ py_test(
300303
py_test(
301304
name = "bazel_overrides_test",
302305
size = "medium",
306+
timeout = "long",
303307
srcs = ["bzlmod/bazel_overrides_test.py"],
304308
tags = [
305309
"requires-network",

src/test/shell/bazel/BUILD

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -317,6 +317,7 @@ sh_test(
317317
sh_test(
318318
name = "bazel_proto_library_test",
319319
size = "large", # Downloads and compiles protobuf for *every* *test* *case*
320+
timeout = "eternal",
320321
srcs = ["bazel_proto_library_test.sh"],
321322
data = [
322323
":rules_proto_stanza.txt",
@@ -731,6 +732,7 @@ sh_test(
731732
sh_test(
732733
name = "starlark_git_repository_test",
733734
size = "large",
735+
timeout = "eternal",
734736
srcs = ["starlark_git_repository_test.sh"],
735737
data = [
736738
":test-deps",
@@ -924,6 +926,7 @@ sh_test(
924926
sh_test(
925927
name = "cc_integration_test",
926928
size = "medium",
929+
timeout = "long",
927930
srcs = ["cc_integration_test.sh"],
928931
data = [":test-deps"],
929932
shard_count = 5,
@@ -1169,6 +1172,7 @@ sh_test(
11691172
sh_test(
11701173
name = "bazel_strategy_test",
11711174
size = "small",
1175+
timeout = "moderate",
11721176
srcs = ["bazel_strategy_test.sh"],
11731177
data = [":test-deps"],
11741178
tags = ["no_windows"],
@@ -1324,6 +1328,7 @@ sh_test(
13241328

13251329
sh_test(
13261330
name = "check_external_files_test",
1331+
timeout = "long",
13271332
srcs = ["check_external_files_test.sh"],
13281333
data = [
13291334
":test-deps",

src/test/shell/integration/BUILD

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,7 @@ sh_test(
228228
sh_test(
229229
name = "stub_finds_runfiles_test",
230230
size = "medium",
231+
timeout = "long",
231232
srcs = ["stub_finds_runfiles_test.sh"],
232233
data = [":test-deps"],
233234
tags = ["no_windows"],
@@ -589,13 +590,15 @@ sh_test(
589590
sh_test(
590591
name = "client_test",
591592
size = "medium",
593+
timeout = "long",
592594
srcs = ["client_test.sh"],
593595
data = [":test-deps"],
594596
tags = ["no_windows"],
595597
)
596598

597599
sh_test(
598600
name = "test_test",
601+
timeout = "long",
599602
srcs = ["test_test.sh"],
600603
data = [
601604
":test-deps",
@@ -726,6 +729,7 @@ sh_test(
726729

727730
sh_test(
728731
name = "py_args_escaping_test",
732+
timeout = "long",
729733
srcs = ["py_args_escaping_test.sh"],
730734
data = [":test-deps"],
731735
deps = ["@bazel_tools//tools/bash/runfiles"],

0 commit comments

Comments
 (0)