Skip to content

Commit 22db3b8

Browse files
committed
Fix unit tests
1 parent 303f4f6 commit 22db3b8

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/GeoIpDownloaderTests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import org.elasticsearch.cluster.block.ClusterBlocks;
2828
import org.elasticsearch.cluster.metadata.IndexMetadata;
2929
import org.elasticsearch.cluster.metadata.ProjectId;
30+
import org.elasticsearch.cluster.project.TestProjectResolvers;
3031
import org.elasticsearch.cluster.service.ClusterService;
3132
import org.elasticsearch.common.settings.ClusterSettings;
3233
import org.elasticsearch.common.settings.Settings;
@@ -698,7 +699,7 @@ private static class MockClient extends NoOpClient {
698699
private final Map<ActionType<?>, BiConsumer<? extends ActionRequest, ? extends ActionListener<?>>> handlers = new HashMap<>();
699700

700701
private MockClient(ThreadPool threadPool) {
701-
super(threadPool);
702+
super(threadPool, TestProjectResolvers.mustExecuteFirst());
702703
}
703704

704705
public <Response extends ActionResponse, Request extends ActionRequest> void addHandler(

test/framework/src/main/java/org/elasticsearch/test/client/NoOpClient.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import org.elasticsearch.action.ActionResponse;
1515
import org.elasticsearch.action.ActionType;
1616
import org.elasticsearch.client.internal.support.AbstractClient;
17+
import org.elasticsearch.cluster.project.ProjectResolver;
1718
import org.elasticsearch.cluster.project.TestProjectResolvers;
1819
import org.elasticsearch.common.settings.Settings;
1920
import org.elasticsearch.threadpool.ThreadPool;
@@ -30,6 +31,10 @@ public NoOpClient(ThreadPool threadPool) {
3031
super(Settings.EMPTY, threadPool, TestProjectResolvers.alwaysThrow());
3132
}
3233

34+
public NoOpClient(ThreadPool threadPool, ProjectResolver projectResolver) {
35+
super(Settings.EMPTY, threadPool, projectResolver);
36+
}
37+
3338
@Override
3439
protected <Request extends ActionRequest, Response extends ActionResponse> void doExecute(
3540
ActionType<Response> action,

0 commit comments

Comments
 (0)