8000 [UT] Fix testSetResourceGroupName (backport #59076) by mergify[bot] · Pull Request #59083 · StarRocks/starrocks · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

[UT] Fix testSetResourceGroupName (backport #59076) #59083

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 2 commits into from
Jun 20, 2025
Merged

[UT] Fix testSetResourceGroupName (backport #59076) #59083

merged 2 commits into from
Jun 20, 2025

Conversation

mergify[bot]
Copy link
Contributor
@mergify mergify bot commented May 19, 2025 •
edited by wanpengfei-git
Loading

Why I'm doing:

When utilizing Mockit to intercept method calls on the ResourceGroupMgr, background processes concurrently invoke the same class, resulting in unintended interception of methods invoked by these asynchronous operations. This necessitates that such methods be executed at least once.

AnalyzeSetVariableTest.testSetResourceGroupName

Missing 1 invocation to:
com.starrocks.catalog.ResourceGroupMgr#createBuiltinResourceGroupsIfNotExist()
   on mock instance: com.starrocks.catalog.ResourceGroupMgr@21f023e6

What I'm doing:

For the case testSetResourceGroupName, do not mock the ResourceGroupMgr class anymore.

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.5
    • 3.4
    • 3.3
    • 3.2
    • 3.1
This is an automatic backport of pull request #59076 done by [Mergify](https://mergify.com).

@ZiheLiu @mergify
[UT] Fix testSetResourceGroupName (#59076)
0de0934 
Signed-off-by: zihe.liu <ziheliu1024@gmail.com>
(cherry picked from commit b0fca2d)

# Conflicts:
#	fe/fe-core/src/test/java/com/starrocks/sql/analyzer/AnalyzeSetVariableTest.java
@mergify mergify bot added the conflicts label May 19, 2025
@mergify Mergify
Copy link
Contributor Author
mergify bot commented May 19, 2025

Cherry-pick of b0fca2d has failed:

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

You are currently cherry-picking commit b0fca2d460.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   fe/fe-core/src/test/java/com/starrocks/sql/analyzer/AnalyzeSetVariableTest.java

no changes added to commit (use "git add" and/or "git commit -a")

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 mentioned this pull request May 19, 2025
Merged
24 tasks
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) May 19, 2025 08:36
@mergify mergify bot closed this May 19, 2025
auto-merge was automatically disabled May 19, 2025 08:36

Pull request was closed

@mergify Mergify
Copy link
Contributor Author
mergify bot commented May 19, 2025

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

@ZiheLiu ZiheLiu reopened this Jun 20, 2025
@wanpengfei-git wanpengfei-git enabled auto-merge (squash) June 20, 2025 04:41
@ZiheLiu
fix conflicts
98b1645 
Signed-off-by: zihe.liu <ziheliu1024@gmail.com>
@wanpengfei-git wanpengfei-git merged commit 9bca87f into branch-3.4 Jun 20, 2025
47 of 50 checks passed
@wanpengfei-git wanpengfei-git deleted the mergify/bp/branch-3.4/pr-59076 branch June 20, 2025 06:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ZiheLiu ZiheLiu ZiheLiu approved these changes

Assignees

@ZiheLiu ZiheLiu

Labels
automerge conflicts version:3.4.5
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@ZiheLiu @wanpengfei-git
0