From 3f5f40fcf73a1770a67ead44fa8fc1755a921178 Mon Sep 17 00:00:00 2001 From: Jake Landis Date: Mon, 19 Aug 2019 14:24:12 -0500 Subject: [PATCH] watcher tests - increase stop timeout to 60s (#45679) As of #43939 Watcher tests now correctly block until all Watch executions kicked off by that test are finished. Prior we allowed tests to finish with outstanding watch executions. It was known that this would increase the time needed to finish a test. However, running the tests on CI can be slow and on at least 1 occasion it took 60s to actually finish. This PR simply increases the max allowable timeout for Watcher tests to clean up after themselves. --- .../xpack/watcher/test/AbstractWatcherIntegrationTestCase.java | 2 +- .../SmokeTestWatcherWithSecurityClientYamlTestSuiteIT.java | 2 +- .../elasticsearch/smoketest/SmokeTestWatcherWithSecurityIT.java | 2 +- .../elasticsearch/smoketest/SmokeTestWatcherTestSuiteIT.java | 2 +- .../test/java/org/elasticsearch/smoketest/WatcherRestIT.java | 2 +- .../org/elasticsearch/smoketest/WatcherJiraYamlTestSuiteIT.java | 2 +- .../smoketest/WatcherPagerDutyYamlTestSuiteIT.java | 2 +- .../elasticsearch/smoketest/WatcherSlackYamlTestSuiteIT.java | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/AbstractWatcherIntegrationTestCase.java b/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/AbstractWatcherIntegrationTestCase.java index ddea3e9e0e46d..209dc9afab31a 100644 --- a/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/AbstractWatcherIntegrationTestCase.java +++ b/x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/AbstractWatcherIntegrationTestCase.java @@ -570,7 +570,7 @@ protected void stopWatcher() throws Exception { } throw new AssertionError("unexpected state, retrying with next run"); - }, 30, TimeUnit.SECONDS); + }, 60, TimeUnit.SECONDS); } public static class NoopEmailService extends EmailService { diff --git a/x-pack/qa/smoke-test-watcher-with-security/src/test/java/org/elasticsearch/smoketest/SmokeTestWatcherWithSecurityClientYamlTestSuiteIT.java b/x-pack/qa/smoke-test-watcher-with-security/src/test/java/org/elasticsearch/smoketest/SmokeTestWatcherWithSecurityClientYamlTestSuiteIT.java index 9ec458067dc11..55bb78cdc475e 100644 --- a/x-pack/qa/smoke-test-watcher-with-security/src/test/java/org/elasticsearch/smoketest/SmokeTestWatcherWithSecurityClientYamlTestSuiteIT.java +++ b/x-pack/qa/smoke-test-watcher-with-security/src/test/java/org/elasticsearch/smoketest/SmokeTestWatcherWithSecurityClientYamlTestSuiteIT.java @@ -109,7 +109,7 @@ public void stopWatcher() throws Exception { default: throw new AssertionError("unknown state[" + state + "]"); } - }, 30, TimeUnit.SECONDS); + }, 60, TimeUnit.SECONDS); } @Override diff --git a/x-pack/qa/smoke-test-watcher-with-security/src/test/java/org/elasticsearch/smoketest/SmokeTestWatcherWithSecurityIT.java b/x-pack/qa/smoke-test-watcher-with-security/src/test/java/org/elasticsearch/smoketest/SmokeTestWatcherWithSecurityIT.java index 3bad41a139359..ecd97cc5d85e9 100644 --- a/x-pack/qa/smoke-test-watcher-with-security/src/test/java/org/elasticsearch/smoketest/SmokeTestWatcherWithSecurityIT.java +++ b/x-pack/qa/smoke-test-watcher-with-security/src/test/java/org/elasticsearch/smoketest/SmokeTestWatcherWithSecurityIT.java @@ -118,7 +118,7 @@ public void stopWatcher() throws Exception { } catch (IOException e) { throw new AssertionError(e); } - }, 30, TimeUnit.SECONDS); + }, 60, TimeUnit.SECONDS); adminClient().performRequest(new Request("DELETE", "/my_test_index")); } diff --git a/x-pack/qa/smoke-test-watcher/src/test/java/org/elasticsearch/smoketest/SmokeTestWatcherTestSuiteIT.java b/x-pack/qa/smoke-test-watcher/src/test/java/org/elasticsearch/smoketest/SmokeTestWatcherTestSuiteIT.java index b720f0620de82..b64a20db78fe3 100644 --- a/x-pack/qa/smoke-test-watcher/src/test/java/org/elasticsearch/smoketest/SmokeTestWatcherTestSuiteIT.java +++ b/x-pack/qa/smoke-test-watcher/src/test/java/org/elasticsearch/smoketest/SmokeTestWatcherTestSuiteIT.java @@ -93,7 +93,7 @@ public void stopWatcher() throws Exception { default: throw new AssertionError("unknown state[" + state + "]"); } - }, 30, TimeUnit.SECONDS); + }, 60, TimeUnit.SECONDS); } @Override diff --git a/x-pack/qa/smoke-test-watcher/src/test/java/org/elasticsearch/smoketest/WatcherRestIT.java b/x-pack/qa/smoke-test-watcher/src/test/java/org/elasticsearch/smoketest/WatcherRestIT.java index 3a1155d562d9c..63efe7ad781c8 100644 --- a/x-pack/qa/smoke-test-watcher/src/test/java/org/elasticsearch/smoketest/WatcherRestIT.java +++ b/x-pack/qa/smoke-test-watcher/src/test/java/org/elasticsearch/smoketest/WatcherRestIT.java @@ -92,6 +92,6 @@ public void stopWatcher() throws Exception { default: throw new AssertionError("unknown state[" + state + "]"); } - }, 30, TimeUnit.SECONDS); + }, 60, TimeUnit.SECONDS); } } diff --git a/x-pack/qa/third-party/jira/src/test/java/org/elasticsearch/smoketest/WatcherJiraYamlTestSuiteIT.java b/x-pack/qa/third-party/jira/src/test/java/org/elasticsearch/smoketest/WatcherJiraYamlTestSuiteIT.java index c95c89a7ba954..c2579bed6f390 100644 --- a/x-pack/qa/third-party/jira/src/test/java/org/elasticsearch/smoketest/WatcherJiraYamlTestSuiteIT.java +++ b/x-pack/qa/third-party/jira/src/test/java/org/elasticsearch/smoketest/WatcherJiraYamlTestSuiteIT.java @@ -71,6 +71,6 @@ public void stopWatcher() throws Exception { } catch (IOException e) { throw new AssertionError(e); } - }, 30, TimeUnit.SECONDS); + }, 60, TimeUnit.SECONDS); } } diff --git a/x-pack/qa/third-party/pagerduty/src/test/java/org/elasticsearch/smoketest/WatcherPagerDutyYamlTestSuiteIT.java b/x-pack/qa/third-party/pagerduty/src/test/java/org/elasticsearch/smoketest/WatcherPagerDutyYamlTestSuiteIT.java index 64de13f8375f0..2c79eecdef1be 100644 --- a/x-pack/qa/third-party/pagerduty/src/test/java/org/elasticsearch/smoketest/WatcherPagerDutyYamlTestSuiteIT.java +++ b/x-pack/qa/third-party/pagerduty/src/test/java/org/elasticsearch/smoketest/WatcherPagerDutyYamlTestSuiteIT.java @@ -71,6 +71,6 @@ public void stopWatcher() throws Exception { } catch (IOException e) { throw new AssertionError(e); } - }, 30, TimeUnit.SECONDS); + }, 60, TimeUnit.SECONDS); } } diff --git a/x-pack/qa/third-party/slack/src/test/java/org/elasticsearch/smoketest/WatcherSlackYamlTestSuiteIT.java b/x-pack/qa/third-party/slack/src/test/java/org/elasticsearch/smoketest/WatcherSlackYamlTestSuiteIT.java index a1e2938817bfa..2e916692605ea 100644 --- a/x-pack/qa/third-party/slack/src/test/java/org/elasticsearch/smoketest/WatcherSlackYamlTestSuiteIT.java +++ b/x-pack/qa/third-party/slack/src/test/java/org/elasticsearch/smoketest/WatcherSlackYamlTestSuiteIT.java @@ -71,6 +71,6 @@ public void stopWatcher() throws Exception { } catch (IOException e) { throw new AssertionError(e); } - }, 30, TimeUnit.SECONDS); + }, 60, TimeUnit.SECONDS); } }