Skip to content

Commit e131727

Browse files
parkertimminsgmjehovich
authored andcommitted
Only run cleanup if patterned_text is enabled (elastic#134734)
Fix issue where test methods aren't run enable patterned_text feature flag is not enabled, so index delete in cleanup method fails.
1 parent 25c685f commit e131727

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

x-pack/plugin/logsdb/src/javaRestTest/java/org/elasticsearch/xpack/logsdb/patternedtext/PatternedTextBasicRestIT.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import org.elasticsearch.common.time.DateFormatter;
1414
import org.elasticsearch.common.time.FormatNames;
1515
import org.elasticsearch.test.cluster.ElasticsearchCluster;
16+
import org.elasticsearch.test.cluster.FeatureFlag;
1617
import org.elasticsearch.test.cluster.local.distribution.DistributionType;
1718
import org.elasticsearch.test.rest.ESRestTestCase;
1819
import org.elasticsearch.test.rest.ObjectPath;
@@ -36,6 +37,7 @@ public class PatternedTextBasicRestIT extends ESRestTestCase {
3637
.distribution(DistributionType.DEFAULT)
3738
.setting("xpack.license.self_generated.type", "trial")
3839
.setting("xpack.security.enabled", "false")
40+
.feature(FeatureFlag.PATTERNED_TEXT)
3941
.build();
4042

4143
@Override

x-pack/plugin/logsdb/src/test/java/org/elasticsearch/xpack/logsdb/patternedtext/PatternedTextIntegrationTests.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,9 @@ public void setup() {
9494

9595
@After
9696
public void cleanup() {
97-
assertAcked(admin().indices().prepareDelete(INDEX));
97+
if (PatternedTextFieldMapper.PATTERNED_TEXT_MAPPER.isEnabled()) {
98+
assertAcked(admin().indices().prepareDelete(INDEX));
99+
}
98100
}
99101

100102
public void testSourceMatchAllManyValues() throws IOException {

0 commit comments

Comments
 (0)