Improve stability of RecoveryIndexerTest

Avoid ConcurrentModificationException when reading logs from LogTester.

diff --git a/server/sonar-server/src/test/java/org/sonar/server/es/RecoveryIndexerTest.java b/server/sonar-server/src/test/java/org/sonar/server/es/RecoveryIndexerTest.java
index 01d33c8bb98d76690e7102d7b5d5dc6b12c7068f..f55a6abf8f556dc234bd80aff2d1cb2a04d0b73e 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/es/RecoveryIndexerTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/es/RecoveryIndexerTest.java
@@ -85,6 +85,7 @@ public class RecoveryIndexerTest {
     underTest = newRecoveryIndexer(emptySettings.asConfig());
 
     underTest.start();
+    underTest.stop();
 
     assertThat(logTester.logs(LoggerLevel.DEBUG)).contains(
       "Elasticsearch recovery - sonar.search.recovery.delayInMs=300000",
@@ -186,6 +187,8 @@ public class RecoveryIndexerTest {
       Thread.sleep(1L);
     }
 
+    underTest.stop();
+
     // No rows treated
     assertThatQueueHasSize(1);
     assertThatLogsContain(ERROR, "Elasticsearch recovery - fail to recover documents");
@@ -207,6 +210,8 @@ public class RecoveryIndexerTest {
       Thread.sleep(1L);
     }
 
+    underTest.stop();
+
     // No rows treated
     assertThatQueueHasSize(1);
     assertThatLogsContain(INFO, "Elasticsearch recovery - 1 documents processed [1 failures]");