test: fix testXARollbackWithResourceLock() to ensure ci runs normally #7804
+7
−0
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 2 commits
November 21, 2025 16:28
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR fixes a CI failure in the testXARollbackWithResourceLock() test that was caused by incomplete synchronization with changes from PR #7708. The test now properly initializes the XA transaction state before testing the rollback operation.
Key Changes:
- Added mock setup for
branchRegisterto handle XA transaction initialization - Added
setAutoCommit(false)call to start the XA transaction and set internal state (xaBranchXidandxaActive) - Added clarifying comments explaining the purpose of the setup
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## 2.x #7804 +/- ##
============================================
+ Coverage 69.92% 70.60% +0.67%
- Complexity 992 994 +2
============================================
Files 1322 1322
Lines 50175 50175
Branches 5932 5932
============================================
+ Hits 35086 35426 +340
+ Misses 12156 11811 -345
- Partials 2933 2938 +5 see 18 files with indirect coverage changes 🚀 New features to boost your workflow:
|
diguage
pushed a commit
to diguage/seata
that referenced
this pull request
Nov 26, 2025
YvCeung
pushed a commit
to YvCeung/incubator-seata
that referenced
this pull request
Dec 25, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Ⅰ. Describe what this PR did
Addressing the CI issue caused by testXARollbackWithResourceLock()
The root cause was a change made in #7708 , but the test pull request wasn't synchronized to the last branch, leading to the problem.
https://github.com/apache/incubator-seata/actions/runs/19563643682/job/56021142515?pr=7781
This has now been fixed.
Ⅱ. Does this pull request fix one issue?
Ⅲ. Why don't you add test cases (unit test/integration test)?
Ⅳ. Describe how to verify it
mvn clean test
Ⅴ. Special notes for reviews