From 6efedb41c6fe3fc6eb88f49afc3e7f481514e806 Mon Sep 17 00:00:00 2001
From: Jonathan Nieder <jrn@google.com>
Date: Wed, 2 May 2018 15:23:31 -0700
Subject: [PATCH] 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
---
 org.eclipse.jgit.test/tests.bzl | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/org.eclipse.jgit.test/tests.bzl b/org.eclipse.jgit.test/tests.bzl
index 637fe0c9c..b1b7b7a9d 100644
--- a/org.eclipse.jgit.test/tests.bzl
+++ b/org.eclipse.jgit.test/tests.bzl
@@ -19,6 +19,10 @@ def tests(tests):
     if 'lib' not in labels:
       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 = []
     if src.endswith("RootLocaleTest.java"):
       additional_deps = [
@@ -52,5 +56,6 @@ def tests(tests):
         '//org.eclipse.jgit.junit:junit',
         '//org.eclipse.jgit.lfs:jgit-lfs',
       ],
+      flaky = flaky,
       jvm_flags = ["-Xmx256m", "-Dfile.encoding=UTF-8"],
     )