Skip to content

un-mute ActivateWatchTests, bump up logging, and remove explicit sleeps #42396

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

un-mute ActivateWatchTests, bump up logging, and remove explicit sleeps #42396

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a465848
un-mute ActivateWatchTests, bump up logging, and remove explicit sleeps
jakelandis May 22, 2019
f6e5c58
Merge branch 'master' into address_30699
jakelandis May 23, 2019
c9bdb39
Merge branch 'master' into address_30699
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
20 changes: 8 additions & 12 deletions ...st/java/org/elasticsearch/xpack/watcher/transport/action/activate/ActivateWatchTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,15 @@
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.notNullValue;

@TestLogging("org.elasticsearch.xpack.watcher:DEBUG,org.elasticsearch.xpack.watcher.WatcherIndexingListener:TRACE")
@TestLogging("org.elasticsearch.xpack.watcher:DEBUG,org.elasticsearch.xpack.core.watcher:DEBUG," +
"org.elasticsearch.xpack.watcher.WatcherIndexingListener:TRACE")
public class ActivateWatchTests extends AbstractWatcherIntegrationTestCase {

@Override
protected boolean timeWarped() {
return false;
}

@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/30699")
public void testDeactivateAndActivate() throws Exception {
PutWatchResponse putWatchResponse = watcherClient().preparePutWatch()
.setId("_id")
Expand Down Expand Up @@ -88,13 +88,9 @@ public void testDeactivateAndActivate() throws Exception {
refresh();
long count1 = docCount(".watcher-history*", matchAllQuery());

logger.info("Sleeping for 5 seconds, watch history count [{}]", count1);
Thread.sleep(5000);

refresh();
long count2 = docCount(".watcher-history*", matchAllQuery());

assertThat(count2, is(count1));
//ensure no new watch history
awaitBusy(() -> count1 != docCount(".watcher-history*", matchAllQuery()), 5, TimeUnit.SECONDS);

// lets activate it again
logger.info("Activating watch again");
Expand All @@ -107,11 +103,11 @@ public void testDeactivateAndActivate() throws Exception {
assertThat(getWatchResponse, notNullValue());
assertThat(getWatchResponse.getStatus().state().isActive(), is(true));

logger.info("Sleeping for another five seconds, ensuring that watch is executed");
Thread.sleep(5000);
refresh();
long count3 = docCount(".watcher-history*", matchAllQuery());
assertThat(count3, greaterThan(count1));
assertBusy(() -> {
Copy link
Contributor

@hub-cap hub-cap May 28, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I noticed you added the 5s timeout to the first awaitBusy(), any reason it was not added here?

Copy link
Contributor Author

@jakelandis jakelandis May 28, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there is a subtle difference...

the call above on line 93 is awaitBusy, which in the happy case always take 5 seconds, so this test will always take at least 5 seconds (ensuring nothing changed in that time period).

the call just above on line 107 is assertBusy, which in the happiest case will not need any waiting at all, but can wait up to 10 seconds if needed. It's a subtle change from the min time the test will take to minor increase in the max time the test can take.

Copy link
Contributor

@hub-cap hub-cap May 28, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeesh, i didnt even see that. thanks for the explain.

long count2 = docCount(".watcher-history*", matchAllQuery());
assertThat(count2, greaterThan(count1));
});
}

public void testLoadWatchWithoutAState() throws Exception {
Expand Down