Skip to content

Commit 1f1601b

Browse files
committed
fix test
1 parent ff16ebf commit 1f1601b

File tree

6 files changed

+20
-11
lines changed

6 files changed

+20
-11
lines changed

test/framework/src/main/java/org/elasticsearch/test/FailingFieldPlugin.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,14 @@
2424

2525
public class FailingFieldPlugin extends Plugin implements ScriptPlugin {
2626

27+
public static final String FAILING_FIELD_LANG = "failing_field";
28+
2729
@Override
2830
public ScriptEngine getScriptEngine(Settings settings, Collection<ScriptContext<?>> contexts) {
2931
return new ScriptEngine() {
3032
@Override
3133
public String getType() {
32-
return "failing_field";
34+
return FAILING_FIELD_LANG;
3335
}
3436

3537
@Override

x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/AbstractPausableIntegTestCase.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
import java.util.concurrent.Semaphore;
2323
import java.util.concurrent.TimeUnit;
2424

25+
import static org.elasticsearch.xpack.esql.action.AbstractPauseFieldPlugin.PAUSE_FIELD_LANG;
26+
2527
/** A pausable testcase. Subclasses extend this testcase to simulate slow running queries.
2628
*
2729
* Uses the evaluation of a runtime field in the mappings "pause_me" of type long, along
@@ -64,7 +66,7 @@ public void setupIndex() throws IOException {
6466
mapping.startObject("pause_me");
6567
{
6668
mapping.field("type", "long");
67-
mapping.startObject("script").field("source", "").field("lang", "pause").endObject();
69+
mapping.startObject("script").field("source", "").field("lang", PAUSE_FIELD_LANG).endObject();
6870
}
6971
mapping.endObject();
7072
}

x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/AbstractPauseFieldPlugin.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
*/
2929
public abstract class AbstractPauseFieldPlugin extends Plugin implements ScriptPlugin {
3030

31+
public static final String PAUSE_FIELD_LANG = "pause";
32+
3133
// Called when the engine enters the execute() method.
3234
protected void onStartExecute() {}
3335

@@ -39,7 +41,7 @@ public ScriptEngine getScriptEngine(Settings settings, Collection<ScriptContext<
3941
return new ScriptEngine() {
4042
@Override
4143
public String getType() {
42-
return "pause";
44+
return PAUSE_FIELD_LANG;
4345
}
4446

4547
@Override

x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/CrossClusterAsyncQueryIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ void populateRemoteIndicesWithRuntimeMapping(String clusterAlias) throws IOExcep
412412
mapping.startObject("const");
413413
{
414414
mapping.field("type", "long");
415-
mapping.startObject("script").field("source", "").field("lang", "pause").endObject();
415+
mapping.startObject("script").field("source", "").field("lang", AbstractPauseFieldPlugin.PAUSE_FIELD_LANG).endObject();
416416
}
417417
mapping.endObject();
418418
}

x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/CrossClustersCancellationIT.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import org.elasticsearch.compute.operator.exchange.ExchangeService;
2222
import org.elasticsearch.core.TimeValue;
2323
import org.elasticsearch.plugins.Plugin;
24+
import org.elasticsearch.tasks.TaskCancelledException;
2425
import org.elasticsearch.tasks.TaskInfo;
2526
import org.elasticsearch.test.AbstractMultiClustersTestCase;
2627
import org.elasticsearch.transport.TransportService;
@@ -32,6 +33,7 @@
3233
import java.util.ArrayList;
3334
import java.util.Collection;
3435
import java.util.List;
36+
import java.util.Map;
3537
import java.util.concurrent.TimeUnit;
3638

3739
import static org.elasticsearch.xpack.esql.EsqlTestUtils.getValuesList;
@@ -94,7 +96,7 @@ private void createRemoteIndex(int numDocs) throws Exception {
9496
mapping.startObject("const");
9597
{
9698
mapping.field("type", "long");
97-
mapping.startObject("script").field("source", "").field("lang", "pause").endObject();
99+
mapping.startObject("script").field("source", "").field("lang", AbstractPauseFieldPlugin.PAUSE_FIELD_LANG).endObject();
98100
}
99101
mapping.endObject();
100102
}
@@ -250,7 +252,7 @@ public void testCancelSkipUnavailable() throws Exception {
250252
request.includeCCSMetadata(true);
251253
PlainActionFuture<EsqlQueryResponse> requestFuture = new PlainActionFuture<>();
252254
client().execute(EsqlQueryAction.INSTANCE, request, requestFuture);
253-
assertTrue(PauseFieldPlugin.startEmitting.await(30, TimeUnit.SECONDS));
255+
assertTrue(SimplePauseFieldPlugin.startEmitting.await(30, TimeUnit.SECONDS));
254256
List<TaskInfo> rootTasks = new ArrayList<>();
255257
assertBusy(() -> {
256258
List<TaskInfo> tasks = client(REMOTE_CLUSTER).admin()
@@ -278,7 +280,7 @@ public void testCancelSkipUnavailable() throws Exception {
278280
}
279281
});
280282
} finally {
281-
PauseFieldPlugin.allowEmitting.countDown();
283+
SimplePauseFieldPlugin.allowEmitting.countDown();
282284
}
283285
var resp = requestFuture.actionGet();
284286
EsqlExecutionInfo executionInfo = resp.getExecutionInfo();
@@ -305,8 +307,8 @@ public void testCloseSkipUnavailable() throws Exception {
305307
""");
306308
request.pragmas(randomPragmas());
307309
var requestFuture = client().execute(EsqlQueryAction.INSTANCE, request);
308-
assertTrue(PauseFieldPlugin.startEmitting.await(30, TimeUnit.SECONDS));
309-
PauseFieldPlugin.allowEmitting.countDown();
310+
assertTrue(SimplePauseFieldPlugin.startEmitting.await(30, TimeUnit.SECONDS));
311+
SimplePauseFieldPlugin.allowEmitting.countDown();
310312
cluster(REMOTE_CLUSTER).close();
311313
try (var resp = requestFuture.actionGet()) {
312314
EsqlExecutionInfo executionInfo = resp.getExecutionInfo();

x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/CrossClustersQueryIT.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import org.elasticsearch.index.query.TermsQueryBuilder;
2828
import org.elasticsearch.plugins.Plugin;
2929
import org.elasticsearch.test.AbstractMultiClustersTestCase;
30+
import org.elasticsearch.test.FailingFieldPlugin;
3031
import org.elasticsearch.test.InternalTestCluster;
3132
import org.elasticsearch.test.XContentTestUtils;
3233
import org.elasticsearch.transport.RemoteClusterAware;
@@ -83,7 +84,7 @@ protected Collection<Class<? extends Plugin>> nodePlugins(String clusterAlias) {
8384
List<Class<? extends Plugin>> plugins = new ArrayList<>(super.nodePlugins(clusterAlias));
8485
plugins.add(EsqlPluginWithEnterpriseOrTrialLicense.class);
8586
plugins.add(InternalExchangePlugin.class);
86-
plugins.add(EsqlNodeFailureIT.FailingFieldPlugin.class);
87+
plugins.add(FailingFieldPlugin.class);
8788
return plugins;
8889
}
8990

@@ -1489,7 +1490,7 @@ void populateRemoteIndicesFail(String clusterAlias, String indexName, int numSha
14891490
mapping.startObject("fail_me");
14901491
{
14911492
mapping.field("type", "long");
1492-
mapping.startObject("script").field("source", "").field("lang", "fail").endObject();
1493+
mapping.startObject("script").field("source", "").field("lang", FailingFieldPlugin.FAILING_FIELD_LANG).endObject();
14931494
}
14941495
mapping.endObject();
14951496
}

0 commit comments

Comments
 (0)