test fixes

Signed-off-by: Aditya Khera <kheraadi@amazon.com>

Author: Aditya Khera

rest-api-spec/src/main/resources/rest-api-spec/test/cat.shards/10_basic.yml

@@ -108,7 +108,7 @@
 ---
 "Help from 3.3.0 to 3.3.99":
   - skip:
-      version: " - 3.2.99"
+      version: " - 3.2.99, 3.4.0 - "
       reason: search query failure stats is added in 3.3.0
       features: node_selector
   - do:

server/src/test/java/org/opensearch/index/merge/MergedSegmentWarmerStatsTests.java

@@ -129,7 +129,7 @@ public void testToXContent() throws IOException {
         builder.endObject();
 
         String json = builder.toString();
-        assertTrue(json.contains("merged_segment_warmer"));
+        assertTrue(json.contains("warmer"));
         assertTrue(json.contains("total_invocations_count"));
         assertTrue(json.contains("total_time_millis"));
         assertTrue(json.contains("total_failure_count"));