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

[UT] fix unstable ut (backport #46617) #46629

Merged
merged 2 commits into from
Jun 5, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 4, 2024

Why I'm doing:

sleep a fixed time may not enough

What I'm doing:

run test every 10 seconds until timeout.

Fixes #issue

What type of PR is this:

  • BugFix
  • Feature
  • Enhancement
  • Refactor
  • UT
  • Doc
  • Tool

Does this PR entail a change in behavior?

  • Yes, this PR will result in a change in behavior.
  • No, this PR will not result in a change in behavior.

If yes, please specify the type of change:

  • Interface/UI changes: syntax, type conversion, expression evaluation, display information
  • Parameter changes: default values, similar parameters but with different default values
  • Policy changes: use new policy to replace old one, functionality automatically enabled
  • Feature removed
  • Miscellaneous: upgrade & downgrade compatibility, etc.

Checklist:

  • I have added test cases for my bug fix or my new feature
  • This pr needs user documentation (for new or modified features or behaviors)
    • I have added documentation for my new feature or new function
  • This is a backport pr

Bugfix cherry-pick branch check:

  • I have checked the version labels which the pr will be auto-backported to the target branch
    • 3.3
    • 3.2
    • 3.1
    • 3.0
    • 2.5

This is an automatic backport of pull request #46617 done by [Mergify](https://mergify.com). ## Why I'm doing: sleep a fixed time may not enough

What I'm doing:

run test every 10 seconds until timeout.

Fixes #issue

What type of PR is this:

  • BugFix
  • Feature
  • Enhancement
  • Refactor
  • UT
  • Doc
  • Tool

Does this PR entail a change in behavior?

  • Yes, this PR will result in a change in behavior.
  • No, this PR will not result in a change in behavior.

If yes, please specify the type of change:

  • Interface/UI changes: syntax, type conversion, expression evaluation, display information
  • Parameter changes: default values, similar parameters but with different default values
  • Policy changes: use new policy to replace old one, functionality automatically enabled
  • Feature removed
  • Miscellaneous: upgrade & downgrade compatibility, etc.

Checklist:

  • I have added test cases for my bug fix or my new feature
  • This pr needs user documentation (for new or modified features or behaviors)
    • I have added documentation for my new feature or new function
  • This is a backport pr

Signed-off-by: packy92 <[email protected]>
(cherry picked from commit 92604ff)

# Conflicts:
#	test/lib/sr_sql_lib.py
Copy link
Contributor Author

mergify bot commented Jun 4, 2024

Cherry-pick of 92604ff has failed:

On branch mergify/bp/branch-2.5/pr-46617
Your branch is up to date with 'origin/branch-2.5'.

You are currently cherry-picking commit 92604ff78c.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   test/sql/test_refresh_statistics/R/test_clear_stats
	modified:   test/sql/test_refresh_statistics/T/test_clear_stats

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   test/lib/sr_sql_lib.py

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot added the conflicts label Jun 4, 2024
@mergify mergify bot mentioned this pull request Jun 4, 2024
24 tasks
@mergify mergify bot closed this Jun 4, 2024
Copy link
Contributor Author

mergify bot commented Jun 4, 2024

@mergify[bot]: Backport conflict, please reslove the conflict and resubmit the pr

@mergify mergify bot deleted the mergify/bp/branch-2.5/pr-46617 branch June 4, 2024 09:44
@packy92 packy92 restored the mergify/bp/branch-2.5/pr-46617 branch June 5, 2024 02:22
@packy92 packy92 reopened this Jun 5, 2024
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) June 5, 2024 02:22
Signed-off-by: packy92 <[email protected]>
@wanpengfei-git wanpengfei-git merged commit d4b7d68 into branch-2.5 Jun 5, 2024
25 checks passed
@wanpengfei-git wanpengfei-git deleted the mergify/bp/branch-2.5/pr-46617 branch June 5, 2024 02:28
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.

2 participants