aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/test/shell/integration/BUILD
diff options
context:
space:
mode:
authorGravatar ruperts <ruperts@google.com>2018-02-13 13:39:38 -0800
committerGravatar Copybara-Service <copybara-piper@google.com>2018-02-13 13:40:54 -0800
commit3c082bafa3c88eaf802e748b41aebf09064a1b89 (patch)
tree615364a030406bc40267aa0d76f60b1ee21140c0 /src/test/shell/integration/BUILD
parent14dbe1392a085bf8a8b9528c5caab55de47325d1 (diff)
Increase timeout on incompatible_changes_conflict_test.
RELNOTES: None. PiperOrigin-RevId: 185580415
Diffstat (limited to 'src/test/shell/integration/BUILD')
-rw-r--r--src/test/shell/integration/BUILD1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/test/shell/integration/BUILD b/src/test/shell/integration/BUILD
index 9c2f69674c..6395fea9ac 100644
--- a/src/test/shell/integration/BUILD
+++ b/src/test/shell/integration/BUILD
@@ -166,6 +166,7 @@ sh_test(
sh_test(
name = "incompatible_changes_conflict_test",
size = "small",
+ timeout = "moderate",
srcs = ["incompatible_changes_conflict_test.sh"],
data = [":test-deps"],
)