Skip to content

Commit 0e3e8c6

Browse files
authored
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.
1 parent 6676a8e commit 0e3e8c6

File tree

8 files changed

+8
-8
lines changed

8 files changed

+8
-8
lines changed

x-pack/plugin/watcher/src/test/java/org/elasticsearch/xpack/watcher/test/AbstractWatcherIntegrationTestCase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -550,7 +550,7 @@ protected void stopWatcher() throws Exception {
550550
}
551551

552552
throw new AssertionError("unexpected state, retrying with next run");
553-
}, 30, TimeUnit.SECONDS);
553+
}, 60, TimeUnit.SECONDS);
554554
}
555555

556556
public static class NoopEmailService extends EmailService {

x-pack/qa/smoke-test-watcher-with-security/src/test/java/org/elasticsearch/smoketest/SmokeTestWatcherWithSecurityClientYamlTestSuiteIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public void stopWatcher() throws Exception {
109109
default:
110110
throw new AssertionError("unknown state[" + state + "]");
111111
}
112-
}, 30, TimeUnit.SECONDS);
112+
}, 60, TimeUnit.SECONDS);
113113
}
114114

115115
@Override

x-pack/qa/smoke-test-watcher-with-security/src/test/java/org/elasticsearch/smoketest/SmokeTestWatcherWithSecurityIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ public void stopWatcher() throws Exception {
117117
} catch (IOException e) {
118118
throw new AssertionError(e);
119119
}
120-
}, 30, TimeUnit.SECONDS);
120+
}, 60, TimeUnit.SECONDS);
121121

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

x-pack/qa/smoke-test-watcher/src/test/java/org/elasticsearch/smoketest/SmokeTestWatcherTestSuiteIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public void stopWatcher() throws Exception {
9494
default:
9595
throw new AssertionError("unknown state[" + state + "]");
9696
}
97-
}, 30, TimeUnit.SECONDS);
97+
}, 60, TimeUnit.SECONDS);
9898
}
9999

100100
@Override

x-pack/qa/smoke-test-watcher/src/test/java/org/elasticsearch/smoketest/WatcherRestIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,6 @@ public void stopWatcher() throws Exception {
9292
default:
9393
throw new AssertionError("unknown state[" + state + "]");
9494
}
95-
}, 30, TimeUnit.SECONDS);
95+
}, 60, TimeUnit.SECONDS);
9696
}
9797
}

x-pack/qa/third-party/jira/src/test/java/org/elasticsearch/smoketest/WatcherJiraYamlTestSuiteIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,6 @@ public void stopWatcher() throws Exception {
7171
} catch (IOException e) {
7272
throw new AssertionError(e);
7373
}
74-
}, 30, TimeUnit.SECONDS);
74+
}, 60, TimeUnit.SECONDS);
7575
}
7676
}

x-pack/qa/third-party/pagerduty/src/test/java/org/elasticsearch/smoketest/WatcherPagerDutyYamlTestSuiteIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,6 @@ public void stopWatcher() throws Exception {
7171
} catch (IOException e) {
7272
throw new AssertionError(e);
7373
}
74-
}, 30, TimeUnit.SECONDS);
74+
}, 60, TimeUnit.SECONDS);
7575
}
7676
}

x-pack/qa/third-party/slack/src/test/java/org/elasticsearch/smoketest/WatcherSlackYamlTestSuiteIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,6 @@ public void stopWatcher() throws Exception {
7171
} catch (IOException e) {
7272
throw new AssertionError(e);
7373
}
74-
}, 30, TimeUnit.SECONDS);
74+
}, 60, TimeUnit.SECONDS);
7575
}
7676
}

0 commit comments

Comments
 (0)