summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Nicolas Geoffray <ngeoffray@google.com> 2016-12-05 11:23:06 +0000
committer android-build-merger <android-build-merger@google.com> 2016-12-05 11:23:06 +0000
commit3ba58256ea9da46367680a9b63d9e5313fd685d3 (patch)
treedf18bf0988bafc52129bf39681be7594634f11af
parent012a54c86dd3cf5869f7a8ef1c3792b66bc79f45 (diff)
parent3d32bf0b1e9469ffcb7fd7793d56d0193e1d5d5c (diff)
Merge "Don't use an internal timeout, rely on the test harness one."
am: 3d32bf0b1e Change-Id: Ib30b33778da6d4d27f3c98ff0c6f22b86ce566c3
-rw-r--r--test/522-checker-regression-monitor-exit/src/Main.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/522-checker-regression-monitor-exit/src/Main.java b/test/522-checker-regression-monitor-exit/src/Main.java
index a5e9512796..c4f80fc9c6 100644
--- a/test/522-checker-regression-monitor-exit/src/Main.java
+++ b/test/522-checker-regression-monitor-exit/src/Main.java
@@ -66,7 +66,7 @@ public class Main {
}
try {
- List<Future<Integer>> results = pool.invokeAll(queries, 5, TimeUnit.SECONDS);
+ List<Future<Integer>> results = pool.invokeAll(queries);
int hash = obj.hashCode();
for (int i = 0; i < numThreads; ++i) {