Skip to content

Commit 47a34f8

Browse files
committed
Update yaml rest test requirements
1 parent dc0a082 commit 47a34f8

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.resolve_index/25_resolve_index_with_mode.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ setup:
1313
# If your project uses a different feature flag name, adjust it here.
1414
---
1515
"resolve index returns mode for standard and time_series indices":
16-
- skip:
17-
cluster_features: ["tsdb_indexing"]
18-
reason: "Requires time series indexing support"
16+
- requires:
17+
cluster_features: ["gte_v8.5.0"]
18+
reason: "Requires time series indexing support introduced in v8.5.0"
1919

2020
# Create a standard index
2121
- do:

server/src/test/java/org/elasticsearch/action/admin/indices/resolve/ResolveIndexTests.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ private void validateIndices(List<ResolvedIndex> resolvedIndices, String... expe
365365
assertThat(resolvedIndex.getAliases(), is(((String[]) indexInfo[6])));
366366
assertThat(resolvedIndex.getAttributes(), is(flagsToAttributes(indexInfo)));
367367
assertThat(resolvedIndex.getDataStream(), equalTo((String) indexInfo[5]));
368-
assertThat(resolvedIndex.getMode(), equalTo((IndexMode) indexInfo[7]));
368+
assertThat(resolvedIndex.getMode(), equalTo(((IndexMode) indexInfo[7]).toString()));
369369
}
370370
}
371371

@@ -520,7 +520,8 @@ private Object[] findBackingIndexInfo(Object[][] dataStreamSource, String indexN
520520
false,
521521
false,
522522
dataStreamName,
523-
Strings.EMPTY_ARRAY };
523+
Strings.EMPTY_ARRAY,
524+
IndexMode.STANDARD };
524525
}
525526
}
526527
}

0 commit comments

Comments
 (0)