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

Tests: Add assumption to restrict upgrade test from running against 

invalid backcompat versions.
This commit is contained in:
Ryan Ernst 2014-10-12 01:09:17 -07:00
parent 87497c92ca
commit 08ba5baab0
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/test/java/org/elasticsearch/rest/action/admin/indices/upgrade/UpgradeTest.java
View File

@ -22,6 +22,7 @@ package org.elasticsearch.rest.action.admin.indices.upgrade;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import org.apache.http.impl.client.HttpClients; import org.apache.http.impl.client.HttpClients;
import org.elasticsearch.ExceptionsHelper; import org.elasticsearch.ExceptionsHelper;
import org.elasticsearch.Version;
import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.index.IndexRequestBuilder;
import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.settings.ImmutableSettings;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
@ -30,6 +31,7 @@ import org.elasticsearch.test.ElasticsearchBackwardsCompatIntegrationTest;
import org.elasticsearch.test.rest.client.http.HttpRequestBuilder; import org.elasticsearch.test.rest.client.http.HttpRequestBuilder;
import org.elasticsearch.test.rest.client.http.HttpResponse; import org.elasticsearch.test.rest.client.http.HttpResponse;
import org.elasticsearch.test.rest.json.JsonPath; import org.elasticsearch.test.rest.json.JsonPath;
import org.junit.BeforeClass;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import java.util.ArrayList; import java.util.ArrayList;
@ -40,6 +42,12 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcke
public class UpgradeTest extends ElasticsearchBackwardsCompatIntegrationTest { public class UpgradeTest extends ElasticsearchBackwardsCompatIntegrationTest {
@BeforeClass
public static void checkUpgradeVersion() {
boolean luceneVersionMatches = globalCompatibilityVersion().luceneVersion.equals(Version.CURRENT.luceneVersion);
assumeFalse("lucene versions must be different to run upgrade test", luceneVersionMatches);
}
@Override @Override
protected int minExternalNodes() { protected int minExternalNodes() {
return 2; return 2;
@ -106,7 +114,7 @@ public class UpgradeTest extends ElasticsearchBackwardsCompatIntegrationTest {
assertTrue("index " + status.indexName + " should not be zero sized", status.totalBytes != 0); assertTrue("index " + status.indexName + " should not be zero sized", status.totalBytes != 0);
assertTrue("total bytes must be >= upgrade bytes", status.totalBytes >= status.toUpgradeBytes); assertTrue("total bytes must be >= upgrade bytes", status.totalBytes >= status.toUpgradeBytes);
assertEquals("index " + status.indexName + " should need upgrading", assertEquals("index " + status.indexName + " should need upgrading",
status.totalBytes, status.toUpgradeBytes); status.totalBytes, status.toUpgradeBytes);
} }
} }