Skip to content

Commit b187fa7

Browse files
committed
fix tests
1 parent e4fe9c5 commit b187fa7

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

server/src/main/java/org/elasticsearch/action/support/IndicesOptions.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1209,7 +1209,8 @@ public static boolean isIndicesOptions(String name) {
12091209
|| GatekeeperOptions.IGNORE_THROTTLED.equals(name)
12101210
|| "ignoreThrottled".equals(name)
12111211
|| WildcardOptions.ALLOW_NO_INDICES.equals(name)
1212-
|| "allowNoIndices".equals(name);
1212+
|| "allowNoIndices".equals(name)
1213+
|| ResolutionModeOptions.CROSS_PROJECT_NAME.equals(name);
12131214
}
12141215

12151216
public static IndicesOptions fromParameters(

x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/datafeed/DatafeedNodeSelectorTests.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,8 @@ public void testIndexDoesntExist() {
349349
+ "indices_options [IndicesOptions[ignore_unavailable=false, allow_no_indices=true, expand_wildcards_open=true, "
350350
+ "expand_wildcards_closed=false, expand_wildcards_hidden=false, allow_aliases_to_multiple_indices=true, "
351351
+ "forbid_closed_indices=true, ignore_aliases=false, ignore_throttled=true, "
352-
+ "allow_selectors=true, include_failure_indices=false]] with exception [no such index [not_foo]]"
352+
+ "allow_selectors=true, include_failure_indices=false, resolve_cross_project=false]] "
353+
+ "with exception [no such index [not_foo]]"
353354
)
354355
)
355356
);
@@ -383,8 +384,8 @@ public void testIndexDoesntExist() {
383384
+ "indices given [not_foo] and indices_options [IndicesOptions[ignore_unavailable=false, allow_no_indices=true, "
384385
+ "expand_wildcards_open=true, expand_wildcards_closed=false, expand_wildcards_hidden=false, "
385386
+ "allow_aliases_to_multiple_indices=true, forbid_closed_indices=true, ignore_aliases=false, "
386-
+ "ignore_throttled=true, allow_selectors=true, include_failure_indices=false]] with exception "
387-
+ "[no such index [not_foo]]]"
387+
+ "ignore_throttled=true, allow_selectors=true, include_failure_indices=false, resolve_cross_project=false]] "
388+
+ "with exception [no such index [not_foo]]]"
388389
)
389390
)
390391
);
@@ -561,7 +562,8 @@ public void testSelectNode_GivenJobOpeningAndIndexDoesNotExist() {
561562
+ "indices_options [IndicesOptions[ignore_unavailable=false, allow_no_indices=true, expand_wildcards_open=true, "
562563
+ "expand_wildcards_closed=false, expand_wildcards_hidden=false, allow_aliases_to_multiple_indices=true, "
563564
+ "forbid_closed_indices=true, ignore_aliases=false, ignore_throttled=true, "
564-
+ "allow_selectors=true, include_failure_indices=false]] with exception [no such index [not_foo]]]"
565+
+ "allow_selectors=true, include_failure_indices=false, resolve_cross_project=false]]"
566+
+ " with exception [no such index [not_foo]]]"
565567
)
566568
)
567569
);

0 commit comments

Comments
 (0)