Navigation Menu

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

8287663: Add a regression test for JDK-8287073 #323

Closed
wants to merge 3 commits into from

Conversation

jerboaa
Copy link
Contributor

@jerboaa jerboaa commented May 26, 2023

Simple low risk backport for a regression check of https://bugs.openjdk.org/browse/JDK-8287073 (forthcoming). The only changes were (other than context changes due to optResult.equals(Optional.empty() vs optResult.isEmpty() differences):

  • Bug line in test. Fixed manually
  • Files.writeString() => Files.write() changes in test.

Testing:

  • New regression test fails without the product fix of JDK-8287073, passes with it.
  • Linux container tests on x86_64 and cg1

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-8287663: Add a regression test for JDK-8287073 (Bug - P3)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk8u-dev.git pull/323/head:pull/323
$ git checkout pull/323

Update a local copy of the PR:
$ git checkout pull/323
$ git pull https://git.openjdk.org/jdk8u-dev.git pull/323/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 323

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk8u-dev/pull/323.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented May 26, 2023

👋 Welcome back sgehwolf! 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 openjdk bot changed the title Backport 2d8c6490540e3ccea23b81129b2e4073915071e0 8287663: Add a regression test for JDK-8287073 May 26, 2023
@openjdk
Copy link

openjdk bot commented May 26, 2023

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added the backport label May 26, 2023
@openjdk openjdk bot added the rfr Pull request is ready for review label May 26, 2023
@mlbridge
Copy link

mlbridge bot commented May 26, 2023

Webrevs

Copy link
Member

@phohensee phohensee left a comment

Choose a reason for hiding this comment

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

Lgtm.

@openjdk
Copy link

openjdk bot commented May 26, 2023

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

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

8287663: Add a regression test for JDK-8287073

Reviewed-by: phh, andrew

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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 ready Pull request is ready to be integrated label May 26, 2023
@jerboaa
Copy link
Contributor Author

jerboaa commented May 26, 2023

Thanks for the review, @phohensee!

@jerboaa
Copy link
Contributor Author

jerboaa commented May 26, 2023

x86 tier1 one GHA failure seems unrelated to this patch.

@bridgekeeper
Copy link

bridgekeeper bot commented Jul 13, 2023

@jerboaa This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

@jerboaa
Copy link
Contributor Author

jerboaa commented Jul 14, 2023

Please keep open.

Copy link
Member

@gnu-andrew gnu-andrew left a comment

Choose a reason for hiding this comment

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

The @bug line difference seems to have occurred because JDK-8293540 was backported before JDK-8287107 and JDK-8287073 in 8u.

Can we use this opportunity to get the bug line into numerical order, so any later patches apply cleanly? i.e. @bug 8287107 8287073 8293540 as in openjdk/jdk@6d83482 ? Thanks.

We should probably be removing the @modules line in 8u, but I'm happy to let that stay if it makes backports easier.

@jerboaa
Copy link
Contributor Author

jerboaa commented Aug 11, 2023

Can we use this opportunity to get the bug line into numerical order, so any later patches apply cleanly? i.e. @bug 8287107 8287073 8293540 as in openjdk/jdk@6d83482 ? Thanks.

Fixed. More thoughts?

Copy link
Member

@gnu-andrew gnu-andrew left a comment

Choose a reason for hiding this comment

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

No, that was the only issue I could see. Approved for 8u.

@jerboaa
Copy link
Contributor Author

jerboaa commented Aug 14, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Aug 14, 2023

Going to push as commit fc37942.
Since your change was applied there has been 1 commit pushed to the master branch:

  • 5f62e55: 6722928: Provide a default native GSS-API library on Windows

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Aug 14, 2023

@jerboaa Pushed as commit fc37942.

💡 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
backport integrated Pull request has been integrated
3 participants