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

8303457: Introduce convenience test library APIs for creating test servers for tests in test/jdk/java/net/httpclient #2350

Closed
wants to merge 1 commit into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Mar 28, 2024

I backport this for parity with 17.0.12-oracle.

test/jdk/java/net/httpclient/CancelRequestTest.java
test/jdk/java/net/httpclient/HeadTest.java
Resolved imports.

Omitted files:
test/jdk/java/net/httpclient/AsyncExecutorShutdown.java
test/jdk/java/net/httpclient/CancelStreamedBodyTest.java
test/jdk/java/net/httpclient/ExecutorShutdown.java
test/jdk/java/net/httpclient/ExpectContinueTest.java
test/jdk/java/net/httpclient/Response1xxTest.java
All these already had to be omitted in #2311,
they all came with new features or other changes that should
not be backported as prereq. For the reasoning see PR 2311.


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
  • JDK-8303457 needs maintainer approval

Issue

  • JDK-8303457: Introduce convenience test library APIs for creating test servers for tests in test/jdk/java/net/httpclient (Task - P4 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2350

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 28, 2024

👋 Welcome back goetz! 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 Mar 28, 2024

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

8303457: Introduce convenience test library APIs for creating test servers for tests in test/jdk/java/net/httpclient

Reviewed-by: lucy

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

  • 9f6b099: 8312916: Remove remaining usages of -Xdebug from test/hotspot/jtreg
  • e877941: 8309630: Clean up tests that reference deploy modules
  • ae3aa72: 8304761: Update IANA Language Subtag Registry to Version 2023-03-22
  • 7a9e984: 8294137: Review running times of java.math tests
  • e948504: 8298939: Refactor open/test/jdk/javax/rmi/ssl/SSLSocketParametersTest.sh to jtreg java test
  • 8210811: 8302512: Update IANA Language Subtag Registry to Version 2023-02-14
  • 4cdf296: 8296190: TestMD5Intrinsics and TestMD5MultiBlockIntrinsics don't test the intrinsics
  • ad94e70: 8275334: Move class loading Events to a separate section in hs_err files
  • d29fe03: 8325254: CKA_TOKEN private and secret keys are not necessarily sensitive
  • 7ced722: 8326529: JFR: Test for CompilerCompile events fails due to time out
  • ... and 18 more: https://git.openjdk.org/jdk17u-dev/compare/a6180f720c61d9ca137eed11b8aec40f5233df8d...master

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 changed the title Backport 72de24e59a80a38ea4ea6a8a3f966f555987ac86 8303457: Introduce convenience test library APIs for creating test servers for tests in test/jdk/java/net/httpclient Mar 28, 2024
@openjdk
Copy link

openjdk bot commented Mar 28, 2024

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 Mar 28, 2024
@mlbridge
Copy link

mlbridge bot commented Mar 28, 2024

Webrevs

Copy link

@RealLucy RealLucy 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 Apr 3, 2024

⚠️ @GoeLin This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@openjdk openjdk bot added approval ready Pull request is ready to be integrated and removed approval labels Apr 3, 2024
@GoeLin
Copy link
Member Author

GoeLin commented Apr 4, 2024

/integrate

@openjdk
Copy link

openjdk bot commented Apr 4, 2024

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

  • 7a47adf: 8290126: Add a check in JavadocTester for "javadoc should not crash"
  • 9f6b099: 8312916: Remove remaining usages of -Xdebug from test/hotspot/jtreg
  • e877941: 8309630: Clean up tests that reference deploy modules
  • ae3aa72: 8304761: Update IANA Language Subtag Registry to Version 2023-03-22
  • 7a9e984: 8294137: Review running times of java.math tests
  • e948504: 8298939: Refactor open/test/jdk/javax/rmi/ssl/SSLSocketParametersTest.sh to jtreg java test
  • 8210811: 8302512: Update IANA Language Subtag Registry to Version 2023-02-14
  • 4cdf296: 8296190: TestMD5Intrinsics and TestMD5MultiBlockIntrinsics don't test the intrinsics
  • ad94e70: 8275334: Move class loading Events to a separate section in hs_err files
  • d29fe03: 8325254: CKA_TOKEN private and secret keys are not necessarily sensitive
  • ... and 19 more: https://git.openjdk.org/jdk17u-dev/compare/a6180f720c61d9ca137eed11b8aec40f5233df8d...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Apr 4, 2024

@GoeLin Pushed as commit e913fa7.

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

@GoeLin GoeLin deleted the goetz_backport_8303457 branch April 4, 2024 20:55
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