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.
This commit is contained in:
parent
a3d918bddb
commit
f2241a152f
|
@ -570,7 +570,7 @@ public abstract class AbstractWatcherIntegrationTestCase extends ESIntegTestCase
|
|||
}
|
||||
|
||||
throw new AssertionError("unexpected state, retrying with next run");
|
||||
}, 30, TimeUnit.SECONDS);
|
||||
}, 60, TimeUnit.SECONDS);
|
||||
}
|
||||
|
||||
public static class NoopEmailService extends EmailService {
|
||||
|
|
|
@ -109,7 +109,7 @@ public class SmokeTestWatcherWithSecurityClientYamlTestSuiteIT extends ESClientY
|
|||
default:
|
||||
throw new AssertionError("unknown state[" + state + "]");
|
||||
}
|
||||
}, 30, TimeUnit.SECONDS);
|
||||
}, 60, TimeUnit.SECONDS);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -118,7 +118,7 @@ public class SmokeTestWatcherWithSecurityIT extends ESRestTestCase {
|
|||
} catch (IOException e) {
|
||||
throw new AssertionError(e);
|
||||
}
|
||||
}, 30, TimeUnit.SECONDS);
|
||||
}, 60, TimeUnit.SECONDS);
|
||||
|
||||
adminClient().performRequest(new Request("DELETE", "/my_test_index"));
|
||||
}
|
||||
|
|
|
@ -93,7 +93,7 @@ public class SmokeTestWatcherTestSuiteIT extends ESRestTestCase {
|
|||
default:
|
||||
throw new AssertionError("unknown state[" + state + "]");
|
||||
}
|
||||
}, 30, TimeUnit.SECONDS);
|
||||
}, 60, TimeUnit.SECONDS);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -92,6 +92,6 @@ public class WatcherRestIT extends ESClientYamlSuiteTestCase {
|
|||
default:
|
||||
throw new AssertionError("unknown state[" + state + "]");
|
||||
}
|
||||
}, 30, TimeUnit.SECONDS);
|
||||
}, 60, TimeUnit.SECONDS);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -71,6 +71,6 @@ public class WatcherJiraYamlTestSuiteIT extends ESClientYamlSuiteTestCase {
|
|||
} catch (IOException e) {
|
||||
throw new AssertionError(e);
|
||||
}
|
||||
}, 30, TimeUnit.SECONDS);
|
||||
}, 60, TimeUnit.SECONDS);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -71,6 +71,6 @@ public class WatcherPagerDutyYamlTestSuiteIT extends ESClientYamlSuiteTestCase {
|
|||
} catch (IOException e) {
|
||||
throw new AssertionError(e);
|
||||
}
|
||||
}, 30, TimeUnit.SECONDS);
|
||||
}, 60, TimeUnit.SECONDS);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -71,6 +71,6 @@ public class WatcherSlackYamlTestSuiteIT extends ESClientYamlSuiteTestCase {
|
|||
} catch (IOException e) {
|
||||
throw new AssertionError(e);
|
||||
}
|
||||
}, 30, TimeUnit.SECONDS);
|
||||
}, 60, TimeUnit.SECONDS);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue