Tests: Tweaking static bwc tests to improve stability

mute · Jan 23, 2015 · 83f94a9 · 83f94a9
1 parent e478986
commit 83f94a9
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/test/java/org/elasticsearch/bwcompat/OldIndexBackwardsCompatibilityTests.java b/src/test/java/org/elasticsearch/bwcompat/OldIndexBackwardsCompatibilityTests.java
@@ -125,7 +125,6 @@ public void testAllVersionsTested() throws Exception {
     public void testOldIndexes() throws Exception {
         Collections.shuffle(indexes, getRandom());
         for (String index : indexes) {
-            logMemoryStats();
             logger.info("Testing old index " + index);
             assertOldIndexWorks(index);
         }
@@ -136,6 +135,7 @@ void assertOldIndexWorks(String index) throws Exception {
             .put(InternalNode.HTTP_ENABLED, true) // for _upgrade
             .build();
         loadIndex(index, settings);
+        logMemoryStats();
         assertBasicSearchWorks();
         assertRealtimeGetWorks();
         assertNewReplicasWork();
@@ -192,7 +192,7 @@ void assertNewReplicasWork() throws Exception {
                 .put(InternalNode.HTTP_ENABLED, true) // for _upgrade
                 .build());
         }
-        ensureGreen("test");
+        client().admin().cluster().prepareHealth("test").setWaitForNodes("" + (numReplicas + 1));
         assertAcked(client().admin().indices().prepareUpdateSettings("test").setSettings(ImmutableSettings.builder()
             .put("number_of_replicas", numReplicas)).execute().actionGet());
         // This can take a while when the number of replicas is greater than cluster.routing.allocation.node_concurrent_recoveries