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.
This commit is contained in:
Armin Braun 2020-05-24 09:16:28 +02:00 committed by GitHub
parent b91bae30b1
commit 05c019585e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions

View File

@ -66,7 +66,7 @@ public class DynamicMappingIT extends ESIntegTestCase {
// yet and sends a mapping update to the master node to map "bar" as "text". This
// fails as it had been already mapped as a long by the previous index request.
assertThat(e.getMessage(),
Matchers.containsString("mapper [foo] of different type, current_type [long], merged_type [text]"));
Matchers.containsString("mapper [foo] cannot be changed from type [long] to [text]"));
}
}