Skip to content

8356309: Fix issues uncovered after running jpackage tests locally with installing test packages #24884

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

Conversation

alexeysemenyukoracle
Copy link
Member

@alexeysemenyukoracle alexeysemenyukoracle commented Apr 25, 2025

Fix issues uncovered in the tests after local test runs with the installation of test packages:

  • LinuxHelper: fix a regression from JDK-8354988. Before the JDK-8354988 fix, when a process started with Executor didn't write to stdout, Executor.executeAndGetFirstLineOfOutput() returned an empty string; after the fix, it throws an exception.
  • Fix EmptyFolderTest: when an MSI is installed, it can create empty directories. Empty directories are not created only when it is unpacked. We probably never ran EmptyFolderTest in "install test packages" mode; we always executed it in "unpack test packages" mode.
  • Fix PackageTest.Group to make it work correctly when a test runs jpackage to produce both exe and msi packages, and when they are installed.

Before the fix, the sequence was:

for (action in {create, install, uninstall}) {
  for (test in tests) {
    for (type in {exe, msi}) {
      run $action on $test of $type
    }
  }
}

After the fix, the sequence is:

for (type in {exe, msi}) {
  for (action in {create, install, uninstall}) {
    for (test in tests) {
      run $action on $test of $type
    }
  }
}

Additionally:

  • Add missing @Test annotation to PathGroupTest.testNullId() test case;
  • Fix typo in PListReaderTest: STRING_ARRY -> STRING_ARRAY;
  • Optimize RuntimeImageTest to not run jlink if external Java runtime is supplied;
  • Add a test to RuntimeImageTest to verify jpackage strips the "jmod" directory and the "src.zip" file from an external runtime image

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-8356309: Fix issues uncovered after running jpackage tests locally with installing test packages (Bug - P3)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 24884

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 25, 2025

👋 Welcome back asemenyuk! 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 25, 2025

@alexeysemenyukoracle 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:

8356309: Fix issues uncovered after running jpackage tests locally with installing test packages

Reviewed-by: almatvee

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 5 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
Copy link

openjdk bot commented Apr 25, 2025

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

  • core-libs

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.

@alexeysemenyukoracle alexeysemenyukoracle changed the title Local test followup 8356309: Fix issues uncovered after running jpackage tests locally with installing test packages May 6, 2025
@alexeysemenyukoracle alexeysemenyukoracle marked this pull request as ready for review May 6, 2025 20:34
@alexeysemenyukoracle
Copy link
Member Author

@sashamatveev PTAL

@openjdk openjdk bot added the rfr Pull request is ready for review label May 6, 2025
@mlbridge
Copy link

mlbridge bot commented May 6, 2025

Webrevs

Copy link
Member

@sashamatveev sashamatveev 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.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label May 6, 2025
@alexeysemenyukoracle
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented May 6, 2025

Going to push as commit cbbab07.
Since your change was applied there have been 5 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 May 6, 2025
@openjdk openjdk bot closed this May 6, 2025
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels May 6, 2025
@openjdk
Copy link

openjdk bot commented May 6, 2025

@alexeysemenyukoracle Pushed as commit cbbab07.

💡 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
core-libs [email protected] integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

2 participants