Skip to content
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

Fix flaky tests #1355

Merged
merged 16 commits into from
Jan 3, 2024
Merged

Conversation

ryanbogan
Copy link
Member

@ryanbogan ryanbogan commented Dec 19, 2023

Description

Fixes the flaky tests on k-NN

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Commits are signed as per the DCO using --signoff

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.

Signed-off-by: Ryan Bogan <[email protected]>
Signed-off-by: Ryan Bogan <[email protected]>
Copy link

codecov bot commented Dec 19, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (083ea2b) 85.08% compared to head (ddf5b5c) 85.10%.
Report is 2 commits behind head on main.

Additional details and impacted files
@@             Coverage Diff              @@
##               main    #1355      +/-   ##
============================================
+ Coverage     85.08%   85.10%   +0.01%     
- Complexity     1242     1251       +9     
============================================
  Files           161      162       +1     
  Lines          5069     5101      +32     
  Branches        473      477       +4     
============================================
+ Hits           4313     4341      +28     
- Misses          551      554       +3     
- Partials        205      206       +1     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Signed-off-by: Ryan Bogan <[email protected]>
Signed-off-by: Ryan Bogan <[email protected]>
Signed-off-by: Ryan Bogan <[email protected]>
Signed-off-by: Ryan Bogan <[email protected]>
Signed-off-by: Ryan Bogan <[email protected]>
Signed-off-by: Ryan Bogan <[email protected]>
Signed-off-by: Ryan Bogan <[email protected]>
Signed-off-by: Ryan Bogan <[email protected]>
Signed-off-by: Ryan Bogan <[email protected]>
Signed-off-by: Ryan Bogan <[email protected]>
@ryanbogan ryanbogan requested a review from heemin32 December 27, 2023 19:06
@ryanbogan ryanbogan requested a review from heemin32 January 2, 2024 19:28
@martin-gaievski
Copy link
Member

@ryanbogan - I assume we need this change in 2.x too?

@ryanbogan
Copy link
Member Author

Yeah, this should be backported

@martin-gaievski martin-gaievski merged commit 391a2ef into opensearch-project:main Jan 3, 2024
51 of 52 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.x 2.x
# Navigate to the new working tree
cd .worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-1355-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 391a2ef7de94ddb6d4ad2d67829c8ef29599016d
# Push it to GitHub
git push --set-upstream origin backport/backport-1355-to-2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-1355-to-2.x.

@martin-gaievski
Copy link
Member

martin-gaievski commented Jan 3, 2024

Yeah, this should be backported

Nice, wasn't sure that you have permissions to add PR labels

@ryanbogan ryanbogan deleted the fix_flaky_tests branch January 3, 2024 18:21
@ryanbogan ryanbogan mentioned this pull request Jan 3, 2024
5 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants