Skip to content

Address test failures for SmokeTestWatcherWithSecurityIT #42092

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 7 commits into from
May 24, 2019
Merged

Address test failures for SmokeTestWatcherWithSecurityIT #42092

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f735ae5
Address test failures for SmokeTestWatcherWithSecurityIT
jakelandis May 10, 2019
ff94852
fix imports
jakelandis May 10, 2019
119322c
remove custom log4j file in favor of setting
jakelandis May 10, 2019
307cc9e
Merge branch 'master' of github.com:elastic/elasticsearch into watche…
jakelandis May 20, 2019
ce8aa5a
Merge branch 'master' into watcher_smoketest_test_fix_and_logging
jakelandis May 22, 2019
8d60100
Merge branch 'master' into watcher_smoketest_test_fix_and_logging
jakelandis May 23, 2019
7c27ad8
Merge branch 'master' into watcher_smoketest_test_fix_and_logging
jakelandis May 24, 2019
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
2 changes: 2 additions & 0 deletions x-pack/qa/smoke-test-watcher-with-security/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ integTestCluster {
setting 'xpack.notification.email.account._email.smtp.user', '_user'
keystoreSetting 'xpack.notification.email.account._email.smtp.secure_password', '_passwd'
setting 'xpack.license.self_generated.type', 'trial'
setting 'logger.org.elasticsearch.xpack.watcher', 'debug'
setting 'logger.org.elasticsearch.xpack.core.watcher', 'debug'
extraConfigFile 'roles.yml', 'roles.yml'
setupCommand 'setupTestAdminUser',
'bin/elasticsearch-users', 'useradd', 'test_admin', '-p', 'x-pack-test-password', '-r', 'superuser'
Expand Down
5 changes: 2 additions & 3 deletions ...th-security/src/test/java/org/elasticsearch/smoketest/SmokeTestWatcherWithSecurityIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
package org.elasticsearch.smoketest;

import org.apache.http.util.EntityUtils;
import org.apache.lucene.util.LuceneTestCase.AwaitsFix;
import org.elasticsearch.client.Request;
import org.elasticsearch.client.Response;
import org.elasticsearch.common.Strings;
Expand All @@ -32,7 +31,6 @@
import static org.hamcrest.Matchers.hasEntry;
import static org.hamcrest.Matchers.is;

@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/35361")
public class SmokeTestWatcherWithSecurityIT extends ESRestTestCase {

private static final String TEST_ADMIN_USERNAME = "test_admin";
Expand Down Expand Up @@ -91,7 +89,6 @@ public void startWatcher() throws Exception {

@After
public void stopWatcher() throws Exception {
adminClient().performRequest(new Request("DELETE", "/my_test_index"));

assertBusy(() -> {
try {
Expand Down Expand Up @@ -119,6 +116,8 @@ public void stopWatcher() throws Exception {
throw new AssertionError(e);
}
});

adminClient().performRequest(new Request("DELETE", "/my_test_index"));
}

@Override
Expand Down