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

8278434: timeouts in test java/time/test/java/time/format/TestZoneTextPrinterParser.java #1894

Closed
wants to merge 2 commits into from

Conversation

RealLucy
Copy link
Contributor

@RealLucy RealLucy commented May 24, 2023

This backport is for parity with 11.0.20-oracle.
The patch did not apply cleanly. There were conflicts in the copyright year and in the list of bugs.

Reviews are welcome!


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-8278434: timeouts in test java/time/test/java/time/format/TestZoneTextPrinterParser.java

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1894

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented May 24, 2023

👋 Welcome back lucy! 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 064ee6ae135366d59e9485b449a41d2b55811bbe 8278434: timeouts in test java/time/test/java/time/format/TestZoneTextPrinterParser.java May 24, 2023
@openjdk
Copy link

openjdk bot commented May 24, 2023

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

@openjdk openjdk bot added backport rfr Pull request is ready for review labels May 24, 2023
@mlbridge
Copy link

mlbridge bot commented May 24, 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.

In TextZonePrinterParser.java, the bug list includes 8277049 and 8177819, which do not appear in 11u or in the 17u backport.

The 17u backport doesn't include the ZoneStrings.java jmh test. @GoeLin (openjdk/jdk17u-dev#1228) might want to fix that up.

@RealLucy RealLucy requested a review from phohensee May 25, 2023 07:32
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.

Looks good now.

@openjdk
Copy link

openjdk bot commented May 25, 2023

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

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

8278434: timeouts in test  java/time/test/java/time/format/TestZoneTextPrinterParser.java

Reviewed-by: phh

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 2 new commits pushed to the master branch:

  • 5fa213a: 8287246: DSAKeyValue should check for missing params instead of relying on KeyFactory provider
  • c0ae141: 8275735: [linux] Remove deprecated Metrics api (kernel memory limit)

Please see this link for an up-to-date comparison between the source branch of this pull request and 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 ready Pull request is ready to be integrated label May 25, 2023
@RealLucy
Copy link
Contributor Author

@phohensee Thank you for the review, Paul.

@openjdk
Copy link

openjdk bot commented May 25, 2023

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

  • 5fa213a: 8287246: DSAKeyValue should check for missing params instead of relying on KeyFactory provider
  • c0ae141: 8275735: [linux] Remove deprecated Metrics api (kernel memory limit)

Your commit was automatically rebased without conflicts.

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

openjdk bot commented May 25, 2023

@RealLucy Pushed as commit 2e01473.

💡 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
Development

Successfully merging this pull request may close these issues.

2 participants