Mark CrissCrossMergeTest as flaky
It often fails on my machine, both in maven and bazel. This patch marks the test flaky[1] in bazel so that "bazel test" can run it a few times before declaring failure. [1] https://docs.bazel.build/versions/master/be/common-definitions.html#test.flaky Bug: 534285 Change-Id: Ibe5414fefbffe4e8f86af7047608d51cf5df5c47
This commit is contained in:
parent
5f2ddc8ac0
commit
6efedb41c6
|
@ -19,6 +19,10 @@ def tests(tests):
|
||||||
if 'lib' not in labels:
|
if 'lib' not in labels:
|
||||||
labels.append('lib')
|
labels.append('lib')
|
||||||
|
|
||||||
|
# TODO(http://eclip.se/534285): Make this test pass reliably
|
||||||
|
# and remove the flaky attribute.
|
||||||
|
flaky = src.endswith("CrissCrossMergeTest.java")
|
||||||
|
|
||||||
additional_deps = []
|
additional_deps = []
|
||||||
if src.endswith("RootLocaleTest.java"):
|
if src.endswith("RootLocaleTest.java"):
|
||||||
additional_deps = [
|
additional_deps = [
|
||||||
|
@ -52,5 +56,6 @@ def tests(tests):
|
||||||
'//org.eclipse.jgit.junit:junit',
|
'//org.eclipse.jgit.junit:junit',
|
||||||
'//org.eclipse.jgit.lfs:jgit-lfs',
|
'//org.eclipse.jgit.lfs:jgit-lfs',
|
||||||
],
|
],
|
||||||
|
flaky = flaky,
|
||||||
jvm_flags = ["-Xmx256m", "-Dfile.encoding=UTF-8"],
|
jvm_flags = ["-Xmx256m", "-Dfile.encoding=UTF-8"],
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in New Issue