Skip to content

Commit 460f011

Browse files
authored
Disable another flaky test (#10365)
1 parent 7bc2b7b commit 460f011

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/groovy/springdata/Elasticsearch53SpringTemplateTest.groovy

+7-1
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,14 @@ import org.elasticsearch.node.Node
1818
import org.elasticsearch.search.aggregations.bucket.nested.InternalNested
1919
import org.elasticsearch.search.aggregations.bucket.terms.Terms
2020
import org.elasticsearch.transport.Netty3Plugin
21+
import org.junit.jupiter.api.Assumptions
2122
import org.springframework.data.elasticsearch.core.ElasticsearchTemplate
2223
import org.springframework.data.elasticsearch.core.ResultsExtractor
2324
import org.springframework.data.elasticsearch.core.query.IndexQueryBuilder
2425
import org.springframework.data.elasticsearch.core.query.NativeSearchQuery
2526
import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder
2627
import spock.lang.Shared
28+
import spock.util.environment.Jvm
2729

2830
import java.util.concurrent.atomic.AtomicLong
2931

@@ -45,7 +47,6 @@ class Elasticsearch53SpringTemplateTest extends AgentInstrumentationSpecificatio
4547
ElasticsearchTemplate template
4648

4749
def setupSpec() {
48-
4950
esWorkingDir = File.createTempDir("test-es-working-dir-", "")
5051
esWorkingDir.deleteOnExit()
5152
println "ES work dir: $esWorkingDir"
@@ -81,6 +82,11 @@ class Elasticsearch53SpringTemplateTest extends AgentInstrumentationSpecificatio
8182
}
8283
}
8384

85+
def setup() {
86+
// when running on jdk 21 this test occasionally fails with timeout
87+
Assumptions.assumeTrue(Boolean.getBoolean("testLatestDeps") || !Jvm.getCurrent().isJava21Compatible())
88+
}
89+
8490
def "test elasticsearch error"() {
8591
when:
8692
template.refresh(indexName)

0 commit comments

Comments
 (0)