Skip to content

[Backport 3.x] Fix unitTest task not running the test source set - #2084

Merged
reta merged 1 commit into
opensearch-project:3.xfrom
loggk:backport/2074-3.x
Aug 4, 2026
Merged

[Backport 3.x] Fix unitTest task not running the test source set#2084
reta merged 1 commit into
opensearch-project:3.xfrom
loggk:backport/2074-3.x

Conversation

@loggk

@loggk loggk commented Aug 3, 2026

Copy link
Copy Markdown
Contributor

Backport of #2074 to 3.x. The automated backport failed on a CHANGELOG.md conflict; java-client/build.gradle.kts and BulkIngesterTest.java cherry-picked cleanly.

The only manual change was placing the changelog entry under the existing ### Fixed heading in ## [Unreleased 3.x], since the 4.x section the original entry lived under does not exist on this branch.

Verified on this branch with ./gradlew :java-client:unitTest: 169 classes, 425 tests, 0 failures, and spotlessJavaCheck passes.

…#2074)

* Fix unitTest task not running the test source set

Signed-off-by: Logan Kennedy <kennedylogan22@gmail.com>

* Add src/test/java to the java21 source set

Signed-off-by: Logan Kennedy <kennedylogan22@gmail.com>

* Also add the test source set output to unitTest testClassesDirs

Signed-off-by: Logan Kennedy <kennedylogan22@gmail.com>

* Drop srcDir in favor of testClassesDirs to avoid duplicate classes

Signed-off-by: Logan Kennedy <kennedylogan22@gmail.com>

* Fix timing-flaky BulkIngester flush tests

Signed-off-by: Logan Kennedy <kennedylogan22@gmail.com>

---------

Signed-off-by: Logan Kennedy <kennedylogan22@gmail.com>
(cherry picked from commit 83652e0)
@reta
reta merged commit 146c813 into opensearch-project:3.x Aug 4, 2026
50 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants