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

8353332: Test jdk/jshell/ToolProviderTest.java failed in relation to enable-preview #24492

Closed
wants to merge 1 commit into from

Conversation

lahodaj
Copy link
Contributor

@lahodaj lahodaj commented Apr 7, 2025

JShell keeps persisted preferences in java.util.prefs.Preferences. But, during tests, an empty persistence is typically used, to avoid values persisted on the test machine to affect the test.

But, in case of jdk/jshell/ToolProviderTest.java, this is not done, as JShell is started using the Tool interface.

This patch strives to fix that, by adding indirection in building JShell in JShellToolProvider, and using that in the test to inject empty persistence.

Thanks to @jaikiran for figuring out the probable cause.


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8353332: Test jdk/jshell/ToolProviderTest.java failed in relation to enable-preview (Bug - P3)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/24492/head:pull/24492
$ git checkout pull/24492

Update a local copy of the PR:
$ git checkout pull/24492
$ git pull https://git.openjdk.org/jdk.git pull/24492/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 24492

View PR using the GUI difftool:
$ git pr show -t 24492

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/24492.diff

Using Webrev

Link to Webrev Comment

@lahodaj lahodaj marked this pull request as ready for review April 7, 2025 15:44
@bridgekeeper
Copy link

bridgekeeper bot commented Apr 7, 2025

👋 Welcome back jlahoda! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk
Copy link

openjdk bot commented Apr 7, 2025

@lahodaj This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8353332: Test jdk/jshell/ToolProviderTest.java failed in relation to enable-preview

Reviewed-by: jpai, asotona

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 21 new commits pushed to the master branch:

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the rfr Pull request is ready for review label Apr 7, 2025
@openjdk
Copy link

openjdk bot commented Apr 7, 2025

@lahodaj The following label will be automatically applied to this pull request:

  • kulla

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@mlbridge
Copy link

mlbridge bot commented Apr 7, 2025

Webrevs

@jaikiran
Copy link
Member

jaikiran commented Apr 7, 2025

I don't have knowledge of this area, but given what seems to be happening in this test and the code that I looked through briefly, this proposed change to provide a way for augmenting the building of the JshellTool seems reasonable to me.

I'll update the JBS issue once the CI runs that I've triggered (without this change) come back. That should tell us if local stored preferences is (the only thing) that's playing a role in these failures.

Copy link
Member

@jaikiran jaikiran left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks OK to me. I think it would be good to have someone more familiar with this area review this too.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Apr 8, 2025
Copy link
Member

@asotona asotona left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me.

@lahodaj
Copy link
Contributor Author

lahodaj commented Apr 8, 2025

/integrate

@openjdk
Copy link

openjdk bot commented Apr 8, 2025

Going to push as commit 9088afc4f16b6265e640bf176d8ca8e3ac6ca45c.
Since your change was applied there have been 21 commits pushed to the master branch:

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Apr 8, 2025
@openjdk openjdk bot closed this Apr 8, 2025
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Apr 8, 2025
@openjdk
Copy link

openjdk bot commented Apr 8, 2025

@lahodaj Pushed as commit 9088afc.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
integrated Pull request has been integrated kulla [email protected]
Development

Successfully merging this pull request may close these issues.

3 participants