commit 5994ecac1a6da64a5fd95f0b886205754956d0d5
author Hamza Kaced <hamza.kaced@ericsson.com> Fri Jun 12 11:35:33 2020 -0400
committer Hamza Kaced <hamza.kaced@ericsson.com> Fri Jun 12 12:56:53 2020 -0400
tree 19f806df9db4f998c2f5bf6ab1df1688f7aee817
parent 3f5bac2bf18b30491dd985d62884b13b6ab757ec
parent f6e45423582ceb4db491e59a735ba9fca0dcd1a4

Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Simplify Init for Elasticsearch
  Refactor reindexProjects in Init to be general
  Avoid auto-reindex of projects during init when unneeded

Change-Id: Id945a48cebe8408e86e3c4025fc6fbb1cb09bdc6

javatests/com/google/gerrit/acceptance/pgm/ElasticReindexIT.java

diff --git a/javatests/com/google/gerrit/acceptance/pgm/ElasticReindexIT.java b/javatests/com/google/gerrit/acceptance/pgm/ElasticReindexIT.java
index 38b7e0e..cf349ab 100644
--- a/javatests/com/google/gerrit/acceptance/pgm/ElasticReindexIT.java
+++ b/javatests/com/google/gerrit/acceptance/pgm/ElasticReindexIT.java
@@ -21,7 +21,6 @@
 import com.google.gerrit.testing.ConfigSuite;
 import com.google.inject.Injector;
 import org.eclipse.jgit.lib.Config;
-import org.junit.Before;
 
 public class ElasticReindexIT extends AbstractReindexTests {
 
@@ -39,10 +38,4 @@
   public void configureIndex(Injector injector) {
     createAllIndexes(injector);
   }
-
-  @Before
-  public void reindexFirstSinceElastic() throws Exception {
-    assertServerStartupFails();
-    runGerrit("reindex", "-d", sitePaths.site_path.toString(), "--show-stack-trace");
-  }
 }