Skip to content

Commit 05c0195

Browse files
Fix Test Failure from Incorrect Mapping Conflict Assertion (#57085) (#57088)
I think this is a left-over from #56915 where a change in assertion message didn't make it to this very rare-case assertion.
1 parent b91bae3 commit 05c0195

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

server/src/internalClusterTest/java/org/elasticsearch/index/mapper/DynamicMappingIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public void testConflictingDynamicMappings() {
6666
// yet and sends a mapping update to the master node to map "bar" as "text". This
6767
// fails as it had been already mapped as a long by the previous index request.
6868
assertThat(e.getMessage(),
69-
Matchers.containsString("mapper [foo] of different type, current_type [long], merged_type [text]"));
69+
Matchers.containsString("mapper [foo] cannot be changed from type [long] to [text]"));
7070
}
7171
}
7272

0 commit comments

Comments
 (0)