commit 13ee6cab2ca3b1bef16e3176bfca2c23f10a30d6
author Nasser Grainawi <nasser.grainawi@linaro.org> Mon Oct 03 12:27:55 2022 -0700
committer Nasser Grainawi <nasser.grainawi@linaro.org> Tue Oct 04 16:20:23 2022 -0700
tree 7b7b698613b256911d98fa80d25c3536e06b7c0f
parent fd7e9ba4d1f8790457fb5b631ff212ccd9357ffe

Elasticsearch tests: Recreate container for each test suite

Since Change If3f8d914d5f there are multiple index configs executed in
different config suites in the tests and that means the ElasticContainer
will be stopped after each suite completes. Handle that by always
recreating the container at the start of a suite.

Release-Notes: skip
Bug: Issue 16300
Change-Id: I39926a3dc65a2313fbcfc566f6b2b72238c6fff6

src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryAccountsTest.java

diff --git a/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryAccountsTest.java b/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryAccountsTest.java
index 752a1e7..7f6a585 100644
--- a/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryAccountsTest.java
+++ b/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryAccountsTest.java
@@ -46,12 +46,9 @@
 
   @BeforeClass
   public static void startIndexService() {
-    if (container == null) {
-      // Only start Elasticsearch once
-      container = ElasticContainer.createAndStart(ElasticVersion.V7_16);
-      client = HttpAsyncClients.createDefault();
-      client.start();
-    }
+    container = ElasticContainer.createAndStart(ElasticVersion.V7_16);
+    client = HttpAsyncClients.createDefault();
+    client.start();
   }
 
   @AfterClass

src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java

diff --git a/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java b/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java
index 9a85129..9160b9e 100644
--- a/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java
+++ b/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java
@@ -52,12 +52,9 @@
 
   @BeforeClass
   public static void startIndexService() {
-    if (container == null) {
-      // Only start Elasticsearch once
-      container = ElasticContainer.createAndStart(ElasticVersion.V7_16);
-      client = HttpAsyncClients.createDefault();
-      client.start();
-    }
+    container = ElasticContainer.createAndStart(ElasticVersion.V7_16);
+    client = HttpAsyncClients.createDefault();
+    client.start();
   }
 
   @AfterClass

src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryGroupsTest.java

diff --git a/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryGroupsTest.java b/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryGroupsTest.java
index 6eef24c..271ee19 100644
--- a/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryGroupsTest.java
+++ b/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryGroupsTest.java
@@ -47,12 +47,9 @@
 
   @BeforeClass
   public static void startIndexService() {
-    if (container == null) {
-      // Only start Elasticsearch once
-      container = ElasticContainer.createAndStart(ElasticVersion.V7_16);
-      client = HttpAsyncClients.createDefault();
-      client.start();
-    }
+    container = ElasticContainer.createAndStart(ElasticVersion.V7_16);
+    client = HttpAsyncClients.createDefault();
+    client.start();
   }
 
   @AfterClass

src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryProjectsTest.java

diff --git a/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryProjectsTest.java b/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryProjectsTest.java
index 70cd7de..38eef22 100644
--- a/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryProjectsTest.java
+++ b/src/test/java/com/google/gerrit/elasticsearch/ElasticV7QueryProjectsTest.java
@@ -47,12 +47,9 @@
 
   @BeforeClass
   public static void startIndexService() {
-    if (container == null) {
-      // Only start Elasticsearch once
-      container = ElasticContainer.createAndStart(ElasticVersion.V7_16);
-      client = HttpAsyncClients.createDefault();
-      client.start();
-    }
+    container = ElasticContainer.createAndStart(ElasticVersion.V7_16);
+    client = HttpAsyncClients.createDefault();
+    client.start();
   }
 
   @AfterClass