Tests: Add logic to handle static index upgrade case where index is

already on latest version. See #9207
elastic · Jan 9, 2015 · 4cda543 · 4cda543
1 parent d226a97
commit 4cda543
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/src/test/java/org/elasticsearch/bwcompat/OldIndexBackwardsCompatibilityTests.java b/src/test/java/org/elasticsearch/bwcompat/OldIndexBackwardsCompatibilityTests.java
@@ -19,6 +19,7 @@
 
 package org.elasticsearch.bwcompat;
 
+import org.elasticsearch.Version;
 import org.elasticsearch.action.get.GetResponse;
 import org.elasticsearch.action.search.SearchRequestBuilder;
 import org.elasticsearch.action.search.SearchResponse;
@@ -94,9 +95,16 @@ void assertOldIndexWorks(String index) throws Exception {
         assertBasicSearchWorks();
         assertRealtimeGetWorks();
         assertNewReplicasWork();
-        assertUpgradeWorks();
+        assertUpgradeWorks(isLatestLuceneVersion(index));
         unloadIndex();
     }
+
+    boolean isLatestLuceneVersion(String index) {
+        String versionStr = index.substring(index.indexOf('-') + 1, index.lastIndexOf('.'));
+        Version version = Version.fromString(versionStr);
+        return version.luceneVersion.major == Version.CURRENT.luceneVersion.major &&
+               version.luceneVersion.minor == Version.CURRENT.luceneVersion.minor;
+    }
 
     void assertBasicSearchWorks() {
         SearchRequestBuilder searchReq = client().prepareSearch("test").setQuery(QueryBuilders.matchAllQuery());
@@ -147,10 +155,12 @@ void assertNewReplicasWork() {
             .execute().actionGet());
     }
 
-    void assertUpgradeWorks() throws Exception {
+    void assertUpgradeWorks(boolean alreadyLatest) throws Exception {
         HttpRequestBuilder httpClient = httpClient();
 
-        UpgradeTest.assertNotUpgraded(httpClient, "test");
+        if (alreadyLatest == false) {
+            UpgradeTest.assertNotUpgraded(httpClient, "test");
+        }
         UpgradeTest.runUpgrade(httpClient, "test", "wait_for_completion", "true");
         UpgradeTest.assertUpgraded(httpClient, "test");
     }

diff --git a/src/test/java/org/elasticsearch/rest/action/admin/indices/upgrade/UpgradeTest.java b/src/test/java/org/elasticsearch/rest/action/admin/indices/upgrade/UpgradeTest.java
@@ -204,7 +204,9 @@ public static void assertUpgraded(HttpRequestBuilder httpClient, String index) t
                 for (ShardSegments segs : shard.getShards()) {
                     for (Segment seg : segs.getSegments()) {
                         assertEquals("Index " + indexSegments.getIndex() + " has unupgraded segment " + seg.toString(),
-                                     Version.CURRENT.luceneVersion, seg.version);
+                                     Version.CURRENT.luceneVersion.major, seg.version.major);
+                        assertEquals("Index " + indexSegments.getIndex() + " has unupgraded segment " + seg.toString(),
+                                     Version.CURRENT.luceneVersion.minor, seg.version.minor);
                     }
                 }
             }