Skip to content

Commit a85a8ac

Browse files
authored
Fix TransportPutDatabaseConfigurationActionTests (#130227)
1 parent 97de5cf commit a85a8ac

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/direct/TransportPutDatabaseConfigurationActionTests.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,16 @@
1818
import java.util.HashMap;
1919
import java.util.Map;
2020

21+
import static org.elasticsearch.cluster.ClusterName.DEFAULT;
22+
2123
public class TransportPutDatabaseConfigurationActionTests extends ESTestCase {
2224

2325
public void testValidatePrerequisites() {
2426
ProjectId projectId = randomProjectIdOrDefault();
2527
// Test that we reject two configurations with the same database name but different ids:
2628
String name = randomAlphaOfLengthBetween(1, 50);
2729
IngestGeoIpMetadata ingestGeoIpMetadata = randomIngestGeoIpMetadata(name);
28-
ClusterState state = ClusterState.builder(ClusterState.EMPTY_STATE)
30+
ClusterState state = ClusterState.builder(DEFAULT)
2931
.putProjectMetadata(ProjectMetadata.builder(projectId).putCustom(IngestGeoIpMetadata.TYPE, ingestGeoIpMetadata).build())
3032
.build();
3133
DatabaseConfiguration databaseConfiguration = randomDatabaseConfiguration(randomIdentifier(), name);
@@ -40,7 +42,11 @@ public void testValidatePrerequisites() {
4042
TransportPutDatabaseConfigurationAction.validatePrerequisites(projectId, databaseConfigurationForDifferentName, state);
4143

4244
// Test that we do not reject a configuration if none already exists:
43-
TransportPutDatabaseConfigurationAction.validatePrerequisites(projectId, databaseConfiguration, ClusterState.EMPTY_STATE);
45+
TransportPutDatabaseConfigurationAction.validatePrerequisites(
46+
projectId,
47+
databaseConfiguration,
48+
ClusterState.builder(DEFAULT).putProjectMetadata(ProjectMetadata.builder(projectId)).build()
49+
);
4450

4551
// Test that we do not reject a configuration if one with the same database name AND id already exists:
4652
DatabaseConfiguration databaseConfigurationSameNameSameId = ingestGeoIpMetadata.getDatabases()

muted-tests.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -566,9 +566,6 @@ tests:
566566
issue: https://github.com/elastic/elasticsearch/issues/130145
567567
- class: org.elasticsearch.xpack.logsdb.patternedtext.PatternedTextFieldMapperTests
568568
issue: https://github.com/elastic/elasticsearch/issues/130162
569-
- class: org.elasticsearch.ingest.geoip.direct.TransportPutDatabaseConfigurationActionTests
570-
method: testValidatePrerequisites
571-
issue: https://github.com/elastic/elasticsearch/issues/130178
572569
- class: org.elasticsearch.index.engine.ThreadPoolMergeExecutorServiceDiskSpaceTests
573570
method: testUnavailableBudgetBlocksNewMergeTasksFromStartingExecution
574571
issue: https://github.com/elastic/elasticsearch/issues/130205

0 commit comments

Comments
 (0)