-
Notifications
You must be signed in to change notification settings - Fork 208
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
Conversation
👋 Welcome back goetz! A progress list of the required criteria for merging this PR into |
@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:
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
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 |
This backport pull request has now been updated with issue from the original commit. |
Webrevs
|
GHA failure: StringRepeat.java: Could not reserve enough space for 2097152KB object heap. Unrelated. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM.
|
/integrate |
Going to push as commit 0dce546.
Your commit was automatically rebased without conflicts. |
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
Issue
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