-
Notifications
You must be signed in to change notification settings - Fork 104
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.
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
change Thread.sleep to waitUntil function under test files #1242
Conversation
Signed-off-by: Jacob Choi <[email protected]>
Signed-off-by: Jacob Choi <[email protected]>
alerting/src/test/kotlin/org/opensearch/alerting/resthandler/MonitorRestApiIT.kt
Outdated
Show resolved
Hide resolved
Signed-off-by: Jacob Choi <[email protected]>
Signed-off-by: Jacob Choi <[email protected]>
@@ -69,7 +71,9 @@ class AlertingBackwardsCompatibilityIT : AlertingRestTestCase() { | |||
// the test execution by a lot (might have to wait for Job Scheduler plugin integration first) | |||
// Waiting a minute to ensure the Monitor ran again at least once before checking if the job is running | |||
// on time | |||
Thread.sleep(60000) | |||
OpenSearchTestCase.waitUntil({ | |||
return@waitUntil false |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Instead of false, we would want to verifyMonitorStats
. That way we get the benefit of the waitUtil function
Signed-off-by: Jacob Choi <[email protected]>
The backport to
To backport manually, run these commands in your terminal: # Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/alerting/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/alerting/backport-2.x
# Create a new branch
git switch --create backport-1242-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 a26f4c087fbeae4fb79fd598b8c5cf46ecf11f55
# Push it to GitHub
git push --set-upstream origin backport-1242-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/alerting/backport-2.x Then, create a pull request where the |
@JacobCho-i Looks like the automatic backport failed for this PR. Could you checkout a fork of the 2.x branch, cherry-pick your changes to it, and create another PR directly to the 2.x branch? There were likely some merge conflicts that occurred that caused the backport to fail. |
Manual backport PR #1301 |
Issue #, if available:
#1028
Description of changes:
replaced Thread.sleep functions with waitUntil function in tests under src/test files
CheckList:
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.