Skip to content

Commit 33d30ed

Browse files
committed
Fix testRoleMigration race condition
1 parent e98a367 commit 33d30ed

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

x-pack/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/SecurityIndexRolesMetadataMigrationIT.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,13 @@ private void assertAllRoles(RestClient client, String... roleNames) throws IOExc
176176
{"query":{"bool":{"must":[{"exists":{"field":"metadata.meta"}}]}},"sort":["name"]}""";
177177
Request request = new Request(randomFrom("POST", "GET"), "/_security/_query/role");
178178
request.setJsonEntity(metadataQuery);
179-
Response response = client.performRequest(request);
179+
Response response = null;
180+
try {
181+
response = client.performRequest(request);
182+
} catch (ResponseException e) {
183+
fail(e);
184+
}
185+
assertNotNull(response);
180186
assertOK(response);
181187
Map<String, Object> responseMap = responseAsMap(response);
182188
assertThat(responseMap.get("total"), is(roleNames.length));

0 commit comments

Comments
 (0)