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
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
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
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
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