honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[TEST] Beef up InternalEngineTest and remove bogus timeouts

This commit is contained in:
Simon Willnauer 2014-12-09 09:31:23 +01:00
parent 0c8f5ac129
commit c0d50f2a80
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/test/java/org/elasticsearch/index/engine/internal/InternalEngineTests.java
View File

@ -1480,7 +1480,8 @@ public class InternalEngineTests extends ElasticsearchLuceneTestCase {
try {
holder.start();
assertEquals(store.refCount(), refCount + 2);
break;
holder.stop();
assertEquals(store.refCount(), refCount + 1);
} catch (EngineCreationFailureException ex) {
// all is fine
if (ex.getCause() instanceof CorruptIndexException) {

22
src/test/java/org/elasticsearch/recovery/SimpleRecoveryTests.java
View File

@ -50,7 +50,7 @@ public class SimpleRecoveryTests extends ElasticsearchIntegrationTest {
@Test
public void testSimpleRecovery() throws Exception {
assertAcked(prepareCreate("test", 1).execute().actionGet(5000));
assertAcked(prepareCreate("test", 1).execute().actionGet());
NumShards numShards = getNumShards("test");
@ -76,13 +76,13 @@ public class SimpleRecoveryTests extends ElasticsearchIntegrationTest {
GetResponse getResult;
for (int i = 0; i < 5; i++) {
getResult = client().get(getRequest("test").type("type1").id("1").operationThreaded(false)).actionGet(1000);
getResult = client().get(getRequest("test").type("type1").id("1").operationThreaded(false)).actionGet();
assertThat(getResult.getSourceAsString(), equalTo(source("1", "test")));
getResult = client().get(getRequest("test").type("type1").id("1").operationThreaded(false)).actionGet(1000);
getResult = client().get(getRequest("test").type("type1").id("1").operationThreaded(false)).actionGet();
assertThat(getResult.getSourceAsString(), equalTo(source("1", "test")));
getResult = client().get(getRequest("test").type("type1").id("2").operationThreaded(true)).actionGet(1000);
getResult = client().get(getRequest("test").type("type1").id("2").operationThreaded(true)).actionGet();
assertThat(getResult.getSourceAsString(), equalTo(source("2", "test")));
getResult = client().get(getRequest("test").type("type1").id("2").operationThreaded(true)).actionGet(1000);
getResult = client().get(getRequest("test").type("type1").id("2").operationThreaded(true)).actionGet();
assertThat(getResult.getSourceAsString(), equalTo(source("2", "test")));
}
@ -93,17 +93,17 @@ public class SimpleRecoveryTests extends ElasticsearchIntegrationTest {
ensureGreen();
for (int i = 0; i < 5; i++) {
getResult = client().get(getRequest("test").type("type1").id("1")).actionGet(1000);
getResult = client().get(getRequest("test").type("type1").id("1")).actionGet();
assertThat(getResult.getSourceAsString(), equalTo(source("1", "test")));
getResult = client().get(getRequest("test").type("type1").id("1")).actionGet(1000);
getResult = client().get(getRequest("test").type("type1").id("1")).actionGet();
assertThat(getResult.getSourceAsString(), equalTo(source("1", "test")));
getResult = client().get(getRequest("test").type("type1").id("1")).actionGet(1000);
getResult = client().get(getRequest("test").type("type1").id("1")).actionGet();
assertThat(getResult.getSourceAsString(), equalTo(source("1", "test")));
getResult = client().get(getRequest("test").type("type1").id("2").operationThreaded(true)).actionGet(1000);
getResult = client().get(getRequest("test").type("type1").id("2").operationThreaded(true)).actionGet();
assertThat(getResult.getSourceAsString(), equalTo(source("2", "test")));
getResult = client().get(getRequest("test").type("type1").id("2").operationThreaded(true)).actionGet(1000);
getResult = client().get(getRequest("test").type("type1").id("2").operationThreaded(true)).actionGet();
assertThat(getResult.getSourceAsString(), equalTo(source("2", "test")));
getResult = client().get(getRequest("test").type("type1").id("2").operationThreaded(true)).actionGet(1000);
getResult = client().get(getRequest("test").type("type1").id("2").operationThreaded(true)).actionGet();
assertThat(getResult.getSourceAsString(), equalTo(source("2", "test")));
}
}