Skip to content

Commit b6aa2ed

Browse files
authored
Check FeatureFlag for skipper tests (#138771)
Closes #138770 Closes #138684 Closes #138730
1 parent aaafa6f commit b6aa2ed

File tree

4 files changed

+6
-0
lines changed

4 files changed

+6
-0
lines changed

qa/ccs-common-rest/src/yamlRestTest/java/org/elasticsearch/test/rest/yaml/CcsCommonYamlTestSuiteIT.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ public class CcsCommonYamlTestSuiteIT extends ESClientYamlSuiteTestCase {
9797
.setting("xpack.license.self_generated.type", "trial")
9898
.feature(FeatureFlag.TIME_SERIES_MODE)
9999
.feature(FeatureFlag.SYNTHETIC_VECTORS)
100+
.feature(FeatureFlag.DOC_VALUES_SKIPPER)
100101
.feature(FeatureFlag.GENERIC_VECTOR_FORMAT);
101102

102103
private static ElasticsearchCluster remoteCluster = ElasticsearchCluster.local()

qa/ccs-common-rest/src/yamlRestTest/java/org/elasticsearch/test/rest/yaml/RcsCcsCommonYamlTestSuiteIT.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ public class RcsCcsCommonYamlTestSuiteIT extends ESClientYamlSuiteTestCase {
9797
.feature(FeatureFlag.TIME_SERIES_MODE)
9898
.feature(FeatureFlag.SYNTHETIC_VECTORS)
9999
.feature(FeatureFlag.GENERIC_VECTOR_FORMAT)
100+
.feature(FeatureFlag.DOC_VALUES_SKIPPER)
100101
.user("test_admin", "x-pack-test-password");
101102

102103
private static ElasticsearchCluster fulfillingCluster = ElasticsearchCluster.local()

test/framework/src/main/java/org/elasticsearch/index/mapper/MapperTestCase.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1853,6 +1853,7 @@ protected boolean supportsDocValuesSkippers() {
18531853

18541854
public void testDocValuesSkippers() throws IOException {
18551855
assumeTrue("Mapper does not support doc values skippers", supportsDocValuesSkippers());
1856+
assumeTrue("FeatureFlag disabled", IndexSettings.DOC_VALUES_SKIPPER);
18561857

18571858
IndexVersion preSkipperVersion = IndexVersionUtils.randomPreviousCompatibleVersion(
18581859
random(),

x-pack/plugin/searchable-snapshots/src/internalClusterTest/java/org/elasticsearch/xpack/searchablesnapshots/SearchableSnapshotsIntegTests.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -687,6 +687,9 @@ public void testSnapshotMountedIndexLeavesBlobsUntouched() throws Exception {
687687
}
688688

689689
public void testSnapshotMountedIndexWithTimestampsRecordsTimestampRangeInIndexMetadata() throws Exception {
690+
691+
assumeTrue("Skipper feature flag disabled", IndexSettings.DOC_VALUES_SKIPPER);
692+
690693
final String indexName = randomAlphaOfLength(10).toLowerCase(Locale.ROOT);
691694
int numShards = between(1, 3);
692695

0 commit comments

Comments
 (0)