From e8ba6c58b92cdf4b02678124f1aa6ed59c8c9844 Mon Sep 17 00:00:00 2001 From: Nasser Grainawi Date: Mon, 3 Oct 2022 12:27:55 -0700 Subject: 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. Also fix a couple places that were using the default index config instead of the config from the ConfigSuite. Release-Notes: skip Bug: Issue 16300 Change-Id: I39926a3dc65a2313fbcfc566f6b2b72238c6fff6 --- .../google/gerrit/elasticsearch/ElasticV7QueryAccountsTest.java | 5 +---- .../google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java | 9 +++------ .../google/gerrit/elasticsearch/ElasticV7QueryGroupsTest.java | 5 +---- .../google/gerrit/elasticsearch/ElasticV7QueryProjectsTest.java | 5 +---- .../gerrit/server/query/account/AbstractQueryAccountsTest.java | 5 ++++- .../gerrit/server/query/group/AbstractQueryGroupsTest.java | 2 +- 6 files changed, 11 insertions(+), 20 deletions(-) diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryAccountsTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryAccountsTest.java index 83d2c564e7..6a453a4a21 100644 --- a/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryAccountsTest.java +++ b/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryAccountsTest.java @@ -41,10 +41,7 @@ public class ElasticV7QueryAccountsTest extends AbstractQueryAccountsTest { @BeforeClass public static void startIndexService() { - if (container == null) { - // Only start Elasticsearch once - container = ElasticContainer.createAndStart(ElasticVersion.V7_16); - } + container = ElasticContainer.createAndStart(ElasticVersion.V7_16); } @AfterClass diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java index 30e731756d..b058c51e7a 100644 --- a/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java +++ b/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryChangesTest.java @@ -51,12 +51,9 @@ public class ElasticV7QueryChangesTest extends AbstractQueryChangesTest { @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/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryGroupsTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryGroupsTest.java index 44518b97a9..2804111623 100644 --- a/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryGroupsTest.java +++ b/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryGroupsTest.java @@ -41,10 +41,7 @@ public class ElasticV7QueryGroupsTest extends AbstractQueryGroupsTest { @BeforeClass public static void startIndexService() { - if (container == null) { - // Only start Elasticsearch once - container = ElasticContainer.createAndStart(ElasticVersion.V7_16); - } + container = ElasticContainer.createAndStart(ElasticVersion.V7_16); } @AfterClass diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryProjectsTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryProjectsTest.java index 950443e6c3..3d861cd52f 100644 --- a/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryProjectsTest.java +++ b/javatests/com/google/gerrit/elasticsearch/ElasticV7QueryProjectsTest.java @@ -41,10 +41,7 @@ public class ElasticV7QueryProjectsTest extends AbstractQueryProjectsTest { @BeforeClass public static void startIndexService() { - if (container == null) { - // Only start Elasticsearch once - container = ElasticContainer.createAndStart(ElasticVersion.V7_16); - } + container = ElasticContainer.createAndStart(ElasticVersion.V7_16); } @AfterClass diff --git a/javatests/com/google/gerrit/server/query/account/AbstractQueryAccountsTest.java b/javatests/com/google/gerrit/server/query/account/AbstractQueryAccountsTest.java index f5c962858a..96b8ac46d7 100644 --- a/javatests/com/google/gerrit/server/query/account/AbstractQueryAccountsTest.java +++ b/javatests/com/google/gerrit/server/query/account/AbstractQueryAccountsTest.java @@ -638,7 +638,10 @@ public abstract class AbstractQueryAccountsTest extends GerritServerTests { .getRaw( Account.id(userInfo._accountId), QueryOptions.create( - IndexConfig.createDefault(), 0, 1, schema.getStoredFields().keySet())); + IndexConfig.fromConfig(config).build(), + 0, + 1, + schema.getStoredFields().keySet())); assertThat(rawFields).isPresent(); if (schema.useLegacyNumericFields()) { diff --git a/javatests/com/google/gerrit/server/query/group/AbstractQueryGroupsTest.java b/javatests/com/google/gerrit/server/query/group/AbstractQueryGroupsTest.java index d760003515..56b89bcd0c 100644 --- a/javatests/com/google/gerrit/server/query/group/AbstractQueryGroupsTest.java +++ b/javatests/com/google/gerrit/server/query/group/AbstractQueryGroupsTest.java @@ -370,7 +370,7 @@ public abstract class AbstractQueryGroupsTest extends GerritServerTests { .getRaw( uuid, QueryOptions.create( - IndexConfig.createDefault(), + IndexConfig.fromConfig(config).build(), 0, 10, indexes.getSearchIndex().getSchema().getStoredFields().keySet())); -- cgit v1.2.3