From fdbefa0cd1a4dd357534ef57b3fb50a045c9ec00 Mon Sep 17 00:00:00 2001 From: Andrew Selden Date: Mon, 12 May 2014 12:13:12 -0700 Subject: [PATCH] Fix for benchmark test timeout Lower number of random requests generated for each test so as not to timeout on heavy tests. Addresses #6094 --- .../elasticsearch/action/bench/BenchmarkIntegrationTest.java | 1 - .../org/elasticsearch/action/bench/BenchmarkTestUtil.java | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/test/java/org/elasticsearch/action/bench/BenchmarkIntegrationTest.java b/src/test/java/org/elasticsearch/action/bench/BenchmarkIntegrationTest.java index 87fe7b204d2..50034e4dbe0 100644 --- a/src/test/java/org/elasticsearch/action/bench/BenchmarkIntegrationTest.java +++ b/src/test/java/org/elasticsearch/action/bench/BenchmarkIntegrationTest.java @@ -79,7 +79,6 @@ public class BenchmarkIntegrationTest extends ElasticsearchIntegrationTest { } @Test - @AwaitsFix(bugUrl = "https://github.com/elasticsearch/elasticsearch/issues/6094") public void testSubmitBenchmark() throws Exception { final BenchmarkRequest request = diff --git a/src/test/java/org/elasticsearch/action/bench/BenchmarkTestUtil.java b/src/test/java/org/elasticsearch/action/bench/BenchmarkTestUtil.java index ed77d6fbf76..ea069d333c6 100644 --- a/src/test/java/org/elasticsearch/action/bench/BenchmarkTestUtil.java +++ b/src/test/java/org/elasticsearch/action/bench/BenchmarkTestUtil.java @@ -42,8 +42,8 @@ public class BenchmarkTestUtil { public static final int MAX_MULTIPLIER = 500; public static final int MIN_SMALL_INTERVAL = 1; public static final int MAX_SMALL_INTERVAL = 3; - public static final int MIN_LARGE_INTERVAL = 11; - public static final int MAX_LARGE_INTERVAL = 19; + public static final int MIN_LARGE_INTERVAL = 5; + public static final int MAX_LARGE_INTERVAL = 7; public static final String BENCHMARK_NAME = "test_benchmark"; public static final String COMPETITOR_PREFIX = "competitor_";