From f2bf50684ad9e2fa374e082c4acc1db973787593 Mon Sep 17 00:00:00 2001 From: Tyler Benson Date: Fri, 29 May 2020 14:54:55 -0400 Subject: [PATCH] Use Retry.Mode.SETUP_FEATURE_CLEANUP to improve Elasticsearch test flakiness (DataDog/dd-trace-java#1494) --- gradle/java.gradle | 1 - .../groovy/springdata/Elasticsearch2SpringRepositoryTest.groovy | 1 + .../groovy/springdata/Elasticsearch2SpringRepositoryTest.groovy | 1 + .../groovy/springdata/Elasticsearch53SpringRepositoryTest.groovy | 1 + 4 files changed, 3 insertions(+), 1 deletion(-) diff --git a/gradle/java.gradle b/gradle/java.gradle index 7e4c2b931f..933cda7709 100644 --- a/gradle/java.gradle +++ b/gradle/java.gradle @@ -119,7 +119,6 @@ dependencies { testCompile deps.groovy testCompile deps.testLogging testCompile group: 'info.solidsoft.spock', name: 'spock-global-unroll', version: '0.5.1' - testCompile group: 'com.anotherchrisberry', name: 'spock-retry', version: '0.6.4' testCompile group: 'com.github.stefanbirkner', name: 'system-rules', version: '1.19.0' } diff --git a/instrumentation/elasticsearch/elasticsearch-transport-2.0/src/latestDepTest/groovy/springdata/Elasticsearch2SpringRepositoryTest.groovy b/instrumentation/elasticsearch/elasticsearch-transport-2.0/src/latestDepTest/groovy/springdata/Elasticsearch2SpringRepositoryTest.groovy index da6b7c7764..cdc9b1af20 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-2.0/src/latestDepTest/groovy/springdata/Elasticsearch2SpringRepositoryTest.groovy +++ b/instrumentation/elasticsearch/elasticsearch-transport-2.0/src/latestDepTest/groovy/springdata/Elasticsearch2SpringRepositoryTest.groovy @@ -32,6 +32,7 @@ class Elasticsearch2SpringRepositoryTest extends AgentTestRunner { DocRepository repo = applicationContext.getBean(DocRepository) def setup() { + repo.refresh() TEST_WRITER.clear() runUnderTrace("delete") { repo.deleteAll() diff --git a/instrumentation/elasticsearch/elasticsearch-transport-2.0/src/test/groovy/springdata/Elasticsearch2SpringRepositoryTest.groovy b/instrumentation/elasticsearch/elasticsearch-transport-2.0/src/test/groovy/springdata/Elasticsearch2SpringRepositoryTest.groovy index 7f45989658..76318eaefa 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-2.0/src/test/groovy/springdata/Elasticsearch2SpringRepositoryTest.groovy +++ b/instrumentation/elasticsearch/elasticsearch-transport-2.0/src/test/groovy/springdata/Elasticsearch2SpringRepositoryTest.groovy @@ -33,6 +33,7 @@ class Elasticsearch2SpringRepositoryTest extends AgentTestRunner { DocRepository repo = applicationContext.getBean(DocRepository) def setup() { + repo.refresh() TEST_WRITER.clear() runUnderTrace("delete") { repo.deleteAll() diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.3/src/test/groovy/springdata/Elasticsearch53SpringRepositoryTest.groovy b/instrumentation/elasticsearch/elasticsearch-transport-5.3/src/test/groovy/springdata/Elasticsearch53SpringRepositoryTest.groovy index 4056199249..1b0df5b50d 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-5.3/src/test/groovy/springdata/Elasticsearch53SpringRepositoryTest.groovy +++ b/instrumentation/elasticsearch/elasticsearch-transport-5.3/src/test/groovy/springdata/Elasticsearch53SpringRepositoryTest.groovy @@ -61,6 +61,7 @@ class Elasticsearch53SpringRepositoryTest extends AgentTestRunner { } def setup() { + repo.refresh() TEST_WRITER.clear() runUnderTrace("delete") { repo.deleteAll()