XiaoyangCai360 opened a new pull request, #7802:
URL: https://github.com/apache/incubator-seata/pull/7802
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- Please make sure you have read and understood the contributing
guidelines -->
- [x] I have read the
[CONTRIBUTING.md](https://github.com/apache/incubator-seata/blob/2.x/CONTRIBUTING.md)
guidelines.
- [ ] I have registered the PR
[changes](https://github.com/apache/incubator-seata/tree/2.x/changes).
### Ⅰ. Describe what this PR did
This PR comprehensively fixes flakiness issues in three unit tests of
`ConnectionContextProxyTest.java` within the `rm-datasource` module.
The tests (`testBuildLockKeys`, `testRemoveSavepoint`, and
`testReleaseSavepoint`) were failing intermittently because they relied on
strict string comparison of the lock key list returned by
`ConnectionContext.buildLockKeys()`. The method's underlying collection does
not guarantee iteration order, resulting in non-deterministic key concatenation
(e.g., "key1;key2" vs. "key2;key1").
The fix implements a robust, order-independent assertion across all affected
methods by:
1. Splitting the actual and expected lock key strings by the semicolon
delimiter.
2. Sorting the resulting list of keys (canonicalization).
3. Asserting the equality of the sorted lists, thus validating the content
regardless of key concatenation order.
**No production code changes were made; this is a test-only change to
improve CI stability.**
### Ⅱ. Does this pull request fix one issue?
<!-- If that, add "fixes #xxx" below in the next line, for example, fixes
#97. -->
### Ⅲ. Why don't you add test cases (unit test/integration test)?
This PR specifically addresses the flakiness of existing unit tests in a
single file.
### Ⅳ. Describe how to verify it
To confirm the flakiness is resolved, run the affected test repeatedly using
a non-deterministic test runner such as
[nondex](https://github.com/TestingResearchIllinois/NonDex). Successful runs
across multiple attempts verify the fix:
```bash
mvn -pl rm-datasource \
-am edu.illinois:nondex-maven-plugin:2.1.7:nondex \
-Dtest=org.apache.seata.rm.datasource.ConnectionContextProxyTest#testBuildLockKeys
\
-DnondexRuns=10 \
-DfailIfNoTests=false
```
### Ⅴ. Special notes for reviews
- Test-only change in `rm-datasource` module
(ConnectionContextProxyTest.java).
- No production code modified.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
