Skip to content

[Test] Avoid use the same token name in different tests #74280

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 22, 2021
Merged

[Test] Avoid use the same token name in different tests #74280

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
76a257b
[Test] Avoid use the same token name in different tests
ywangd Jun 18, 2021
604bb64
Merge remote-tracking branch 'origin/master' into es-74278-duplicate-…
ywangd Jun 18, 2021
1d9319c
Unmute tests
ywangd Jun 18, 2021
42c1db8
Merge remote-tracking branch 'origin/master' into es-74278-duplicate-…
ywangd Jun 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions ...h-level/src/test/java/org/elasticsearch/client/documentation/SecurityDocumentationIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2614,7 +2614,6 @@ public void onFailure(Exception e) {
}
}

@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/74278")
public void testCreateServiceAccountToken() throws IOException {
RestHighLevelClient client = highLevelClient();
{
Expand Down Expand Up @@ -2723,14 +2722,13 @@ public void onFailure(Exception e) {
}
}

@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/74278")
public void testGetServiceAccountCredentials() throws IOException {
RestHighLevelClient client = highLevelClient();
final CreateServiceAccountTokenRequest createServiceAccountTokenRequest =
new CreateServiceAccountTokenRequest("elastic", "fleet-server", "token1");
new CreateServiceAccountTokenRequest("elastic", "fleet-server", "token2");
final CreateServiceAccountTokenResponse createServiceAccountTokenResponse =
client.security().createServiceAccountToken(createServiceAccountTokenRequest, RequestOptions.DEFAULT);
assertThat(createServiceAccountTokenResponse.getName(), equalTo("token1"));
assertThat(createServiceAccountTokenResponse.getName(), equalTo("token2"));

{
// tag::get-service-account-credentials-request
Expand All @@ -2752,7 +2750,7 @@ public void testGetServiceAccountCredentials() throws IOException {
// end::get-service-account-credentials-response
assertThat(principal, equalTo("elastic/fleet-server"));
assertThat(serviceTokenInfos.size(), equalTo(1));
assertThat(tokenName, equalTo("token1"));
assertThat(tokenName, equalTo("token2"));
assertThat(tokenSource, equalTo("index"));
}

Expand Down Expand Up @@ -2786,7 +2784,7 @@ public void onFailure(Exception e) {
assertNotNull(future.actionGet());
assertThat(future.actionGet().getPrincipal(), equalTo("elastic/fleet-server"));
assertThat(future.actionGet().getServiceTokenInfos().size(), equalTo(1));
assertThat(future.actionGet().getServiceTokenInfos().get(0), equalTo(new ServiceTokenInfo("token1", "index")));
assertThat(future.actionGet().getServiceTokenInfos().get(0), equalTo(new ServiceTokenInfo("token2", "index")));
}
}

Expand Down