aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Nathan Harmata <nharmata@google.com>2017-01-19 17:17:32 +0000
committerGravatar Vladimir Moskva <vladmos@google.com>2017-01-19 18:05:05 +0000
commitfc346a9814d6ee9de4fc0df45ee7ec20dcdce886 (patch)
tree5f8d4f43e029fb63acff54381005b6637794ebe9
parente7f6fbecef4a55c81daba8e7b3434eeb53888943 (diff)
Mark ConcurrentTests as flaky (flakiness is because of []). This is preferable to disabling the test, but of course the ideal thing to do is actually fix the code.
-- PiperOrigin-RevId: 144970101 MOS_MIGRATED_REVID=144970101
-rw-r--r--src/test/java/com/google/devtools/build/lib/BUILD2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/BUILD b/src/test/java/com/google/devtools/build/lib/BUILD
index c48a0ddada..faf0a0faab 100644
--- a/src/test/java/com/google/devtools/build/lib/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/BUILD
@@ -135,8 +135,6 @@ java_test(
"vfs/inmemoryfs/*.java",
],
exclude = [
- # TODO(#2068): Deflake this test or reactivate once #540 is fixed.
- "concurrent/MultisetSemaphoreTest.java",
# java_rules_skylark doesn't support resource loading with
# qualified paths.
"util/ResourceFileLoaderTest.java",