Skip to content

Conversation

@GoeLin
Copy link
Member

@GoeLin GoeLin commented Sep 30, 2021

I downport this for parity with 11.0.13-oracle.

Response204V2Test.java: resolve imports due to context.
ShortResponseBody.java: resolve copyright and imports.

Change to test/jdk/java/net/httpclient/AggregateRequestBodyTest.java omitted.
The test is not in 11, it only came with "8252374 Add a new factory
method to concatenate..." in 16.

Change to test/jdk/java/net/httpclient/CancelRequestTest.java omitted.
The test is not in 11, it only came with "8245462: HttpClient send throws InterruptedException when interrupted but does not cancel request" in 16.

Change to test/jdk/java/net/httpclient/ISO_8859_1_Test.java b/test/jdk/java/net/httpclient/ISO_8859_1_Test.java omitted.
The test is not in 11, it only came with "8255244 HttpClient: Response headers contain incorrectly encoded Unicode characters" in 16.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8268555: Update HttpClient tests that use ITestContext to jtreg 6+1

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk11u-dev pull/448/head:pull/448
$ git checkout pull/448

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 448

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk11u-dev/pull/448.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 30, 2021

👋 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 openjdk bot changed the title Backport da043e99b830fa4fcbfdbdbed182abc394ba6fb1 8268555: Update HttpClient tests that use ITestContext to jtreg 6+1 Sep 30, 2021
@openjdk
Copy link

openjdk bot commented Sep 30, 2021

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

@openjdk openjdk bot added backport Port of a pull request already in a different code base rfr Pull request is ready for review labels Sep 30, 2021
@mlbridge
Copy link

mlbridge bot commented Sep 30, 2021

Webrevs

Copy link
Contributor

@TheRealMDoerr TheRealMDoerr left a comment

Choose a reason for hiding this comment

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

Thanks for the detailed description of how you resolved it. LGTM.

@openjdk
Copy link

openjdk bot commented Oct 4, 2021

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

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

8268555: Update HttpClient tests that use ITestContext to jtreg 6+1

Reviewed-by: mdoerr

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

  • f12af7e: 8266182: Automate manual steps listed in the test jdk/sun/security/pkcs12/ParamsTest.java
  • 28dec4f: 8223139: Rename mandatory policy-do routines.
  • e1cbfa5: 8248187: [TESTBUG] javax/swing/plaf/basic/BasicGraphicsUtils/8132119/bug8132119.java fails with String is not properly drawn
  • 6a784d2: 8143021: [TEST_BUG] Test javax/swing/JColorChooser/Test6541987.java fails
  • 09ad2c0: 8256152: tests fail because of ambiguous method resolution
  • 2990ff0: 8211171: move JarUtils to top-level testlibrary
  • f7a75de: 8265524: Upgrading JSZip from v3.2.2 to v3.6.0
  • 9f8c13c: 8233569: [TESTBUG] JTextComponent test bug6361367.java fails on macos
  • a6ee356: 8234823: java/net/Socket/Timeouts.java testcase testTimedConnect2() fails on Windows 10
  • 23c3845: 8229935: [TEST_BUG]: bug8132119.java inconsistently positions text
  • ... and 8 more: https://git.openjdk.java.net/jdk11u-dev/compare/97859e836809e33da0ede6db5c0f6410cad24ba9...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 added the ready Pull request is ready to be integrated label Oct 4, 2021
@GoeLin
Copy link
Member Author

GoeLin commented Oct 4, 2021

/integrate

@openjdk
Copy link

openjdk bot commented Oct 4, 2021

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

  • 89ee611: 8223923: C2: Missing interference with mismatched unsafe accesses
  • f12af7e: 8266182: Automate manual steps listed in the test jdk/sun/security/pkcs12/ParamsTest.java
  • 28dec4f: 8223139: Rename mandatory policy-do routines.
  • e1cbfa5: 8248187: [TESTBUG] javax/swing/plaf/basic/BasicGraphicsUtils/8132119/bug8132119.java fails with String is not properly drawn
  • 6a784d2: 8143021: [TEST_BUG] Test javax/swing/JColorChooser/Test6541987.java fails
  • 09ad2c0: 8256152: tests fail because of ambiguous method resolution
  • 2990ff0: 8211171: move JarUtils to top-level testlibrary
  • f7a75de: 8265524: Upgrading JSZip from v3.2.2 to v3.6.0
  • 9f8c13c: 8233569: [TESTBUG] JTextComponent test bug6361367.java fails on macos
  • a6ee356: 8234823: java/net/Socket/Timeouts.java testcase testTimedConnect2() fails on Windows 10
  • ... and 9 more: https://git.openjdk.java.net/jdk11u-dev/compare/97859e836809e33da0ede6db5c0f6410cad24ba9...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Oct 4, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Oct 4, 2021
@openjdk
Copy link

openjdk bot commented Oct 4, 2021

@GoeLin Pushed as commit 6285123.

💡 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_8268555 branch October 4, 2021 19:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport Port of a pull request already in a different code base integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

2 participants