watcher tests - increase stop timeout to 60s (#45679) (#45934)

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:
Jake Landis 2019-08-26 08:34:54 -05:00 committed by GitHub
parent a3d918bddb
commit f2241a152f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 8 additions and 8 deletions

View File

@ -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 {

View File

@ -109,7 +109,7 @@ public class SmokeTestWatcherWithSecurityClientYamlTestSuiteIT extends ESClientY
default:
throw new AssertionError("unknown state[" + state + "]");
}
}, 30, TimeUnit.SECONDS);
}, 60, TimeUnit.SECONDS);
}
@Override

View File

@ -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"));
}

View File

@ -93,7 +93,7 @@ public class SmokeTestWatcherTestSuiteIT extends ESRestTestCase {
default:
throw new AssertionError("unknown state[" + state + "]");
}
}, 30, TimeUnit.SECONDS);
}, 60, TimeUnit.SECONDS);
}
@Override

View File

@ -92,6 +92,6 @@ public class WatcherRestIT extends ESClientYamlSuiteTestCase {
default:
throw new AssertionError("unknown state[" + state + "]");
}
}, 30, TimeUnit.SECONDS);
}, 60, TimeUnit.SECONDS);
}
}

View File

@ -71,6 +71,6 @@ public class WatcherJiraYamlTestSuiteIT extends ESClientYamlSuiteTestCase {
} catch (IOException e) {
throw new AssertionError(e);
}
}, 30, TimeUnit.SECONDS);
}, 60, TimeUnit.SECONDS);
}
}

View File

@ -71,6 +71,6 @@ public class WatcherPagerDutyYamlTestSuiteIT extends ESClientYamlSuiteTestCase {
} catch (IOException e) {
throw new AssertionError(e);
}
}, 30, TimeUnit.SECONDS);
}, 60, TimeUnit.SECONDS);
}
}

View File

@ -71,6 +71,6 @@ public class WatcherSlackYamlTestSuiteIT extends ESClientYamlSuiteTestCase {
} catch (IOException e) {
throw new AssertionError(e);
}
}, 30, TimeUnit.SECONDS);
}, 60, TimeUnit.SECONDS);
}
}