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

8295944: Move the Http2TestServer and related classes into a package of its own #2311

Closed
wants to merge 3 commits into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Mar 19, 2024

I backport this to simplify further backports. It's a refactoring of test infra.

I had to do resolves of Copyright, imports, and @test descriptions. A row of tests are not in 17.
In detail:

test/jdk/java/net/httpclient/AsFileDownloadTest.java
Needs resolve because earlier changes were al

test/jdk/java/net/httpclient/AsyncExecutorShutdown.java
Introduced in 19 by "8277969: HttpClient SelectorManager shuts down when custom Executor rejects a task"
This is a bug fix one wants to have in 17 at first sight, but it is a big change
and it had several follow ups. So better don't backport as prerequisite.

test/jdk/java/net/httpclient/CancelRequestTest.java
Resolved Copyright.

test/jdk/java/net/httpclient/CancelStreamedBodyTest.java
Introduced in 20 by "294916: Cancelling a request must eventually cause its response body subscriber to be unregistered"
This fix has many prereqs that would need to be backported. Omit.

test/jdk/java/net/httpclient/DigestEchoClient.java
Resolved Copyright.

test/jdk/java/net/httpclient/ExecutorShutdown.java
As above introduced by "8277969: HttpClient SelectorManager shuts down when custom Executor rejects a task". Omit.

test/jdk/java/net/httpclient/ExpectContinueTest.java
Introduced in 20 by "8286171: HttpClient/2 : Expect:100-Continue blocks indefinitely when response is not 100"

test/jdk/java/net/httpclient/HeadTest.java
Resolved Copyright and imports.
"8276559: (httpclient) Consider adding an HttpRequest.Builder.HEAD method to build a HEAD request." which came in 18
is a new feature with CSR that changed the imports.

test/jdk/java/net/httpclient/HttpClientLocalAddrTest.java
Introduced in 19 by "8209137: Add ability to bind to specific local address to HTTP client". A new
feature. Omit.

test/jdk/java/net/httpclient/ISO_8859_1_Test.java
Resolved Copyright

test/jdk/java/net/httpclient/MappingResponseSubscriber.java
Resolved imports.

test/jdk/java/net/httpclient/Response1xxTest.java
Introduced in 20 by 8292044: HttpClient doesn't handle 102 or 103 properly. Omit.

test/jdk/java/net/httpclient/SpecialHeadersTest.java
Resolved due to context.

test/jdk/java/net/httpclient/http2/IdleConnectionTimeoutTest.java
Was added by 8288717: Add a means to close idle connections in HTTP/2 connection pool in 20. Omit.

test/jdk/java/net/httpclient/http2/PushPromiseContinuation.java
Was added by 8263031: HttpClient throws Exception if it receives a Push Promise that is too large in 19. Omit.

test/jdk/java/net/httpclient/http2/UserInfoTest.java
Was added by 8292876: Do not include the deprecated userinfo component of the URI in HTTP/2 headers in 20. Omit.

test/jdk/java/net/httpclient/httpclient-localaddr-security.policy
Was added by 8209137: Add ability to bind to specific local address to HTTP client in 19. Omit.

test/jdk/java/net/httpclient/lib/jdk/httpclient/test/lib/common/HttpServerAdapters.java
Omitted Copyright, was already updated.

test/jdk/java/net/httpclient/lib/jdk/httpclient/test/lib/http2/Http2TestExchangeImpl.java
test/jdk/java/net/httpclient/lib/jdk/httpclient/test/lib/http2/Http2TestServer.java
test/jdk/java/net/httpclient/lib/jdk/httpclient/test/lib/http2/Http2TestServerConnection.java
test/jdk/java/net/httpclient/lib/jdk/httpclient/test/lib/http2/OutgoingPushPromise.java
Resolved Copyritht and in some the package statement.

Update:
Our testing showed that ConnectionReuseTest.java has to be adapted. See third commit.
It was crafted after this change and had to be adapted to the old location of the test helpers when being backported.
This test passes with the changes.


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-8295944 needs maintainer approval

Issue

  • JDK-8295944: Move the Http2TestServer and related classes into a package of its own (Task - P4 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2311

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 19, 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 19, 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:

8295944: Move the Http2TestServer and related classes into a package of its own

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

  • f6c87d8: 8326661: sun/java2d/cmm/ColorConvertOp/ColConvTest.java assumes profiles were generated by LCMS
  • b293856: 8323994: gtest runner repeats test name for every single gtest assertion
  • f52725d: 8280056: gtest/LargePageGtests.java#use-large-pages failed "os.release_one_mapping_multi_commits_vm"
  • 91ac085: 8328825: Google CAInterop test failures
  • 533e1b1: 8328948: GHA: Restoring sysroot from cache skips the build after JDK-8326960
  • 791be77: 8328705: GHA: Cross-compilation jobs do not require build JDK
  • 432210b: 8280546: Remove hard-coded 127.0.0.1 loopback address
  • d74ef51: 8260540: serviceability/jdwp/AllModulesCommandTest.java failed with "Debuggee error: 'ERROR: transport error 202: bind failed: Address already in use'"
  • b4d22f6: 8326960: GHA: RISC-V sysroot cannot be debootstrapped due to ongoing Debian t64 transition
  • 56ed749: 8327059: os::Linux::print_proc_sys_info add swappiness information
  • ... and 17 more: https://git.openjdk.org/jdk17u-dev/compare/fce02ad5cb321bbcf63c8476cd28821b3e187e5b...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 8a47429dc065ad7645a40fa2350d043ef4606d92 8295944: Move the Http2TestServer and related classes into a package of its own Mar 19, 2024
@openjdk
Copy link

openjdk bot commented Mar 19, 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 19, 2024
@mlbridge
Copy link

mlbridge bot commented Mar 19, 2024

Webrevs

@GoeLin
Copy link
Member Author

GoeLin commented Mar 20, 2024

GHA failure: StringRepeat.java: Could not reserve enough space for 2097152KB object heap. Unrelated.
GHA failure Risc-V compile setup problem. Unrelated.

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 Mar 26, 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 Mar 27, 2024
@GoeLin
Copy link
Member Author

GoeLin commented Mar 28, 2024

/integrate

@openjdk
Copy link

openjdk bot commented Mar 28, 2024

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

  • f6c87d8: 8326661: sun/java2d/cmm/ColorConvertOp/ColConvTest.java assumes profiles were generated by LCMS
  • b293856: 8323994: gtest runner repeats test name for every single gtest assertion
  • f52725d: 8280056: gtest/LargePageGtests.java#use-large-pages failed "os.release_one_mapping_multi_commits_vm"
  • 91ac085: 8328825: Google CAInterop test failures
  • 533e1b1: 8328948: GHA: Restoring sysroot from cache skips the build after JDK-8326960
  • 791be77: 8328705: GHA: Cross-compilation jobs do not require build JDK
  • 432210b: 8280546: Remove hard-coded 127.0.0.1 loopback address
  • d74ef51: 8260540: serviceability/jdwp/AllModulesCommandTest.java failed with "Debuggee error: 'ERROR: transport error 202: bind failed: Address already in use'"
  • b4d22f6: 8326960: GHA: RISC-V sysroot cannot be debootstrapped due to ongoing Debian t64 transition
  • 56ed749: 8327059: os::Linux::print_proc_sys_info add swappiness information
  • ... and 17 more: https://git.openjdk.org/jdk17u-dev/compare/fce02ad5cb321bbcf63c8476cd28821b3e187e5b...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Mar 28, 2024

@GoeLin Pushed as commit 0dce546.

💡 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