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

8286293: Tests ShortResponseBody and ShortResponseBodyWithRetry should use less resources #1095

Closed
wants to merge 2 commits into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented May 18, 2022

I backport this test-only change for parity with 11.0.17-oracle.

I did the following adaptions:
ShortResponseBody.java

  • Adapt test run specification to requirements of 11.
    This did not match in this file, but all other files
    needed fixes, too.
  • Resolve includes
  • Removal of four methods did not apply clean.
    The methods were moved to the new files.
    I dropped the old implementation and am using the
    new ones in the new files except for assertExpectedMessage()
    which is not in 11.

ShortResponseBodyPostWithRetry.java

  • test run specification: different context

Tests are compiling and passing.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed (1 review required, with at least 1 reviewer)

Issue

  • JDK-8286293: Tests ShortResponseBody and ShortResponseBodyWithRetry should use less resources

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1095

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented May 18, 2022

👋 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 f143386109bce2a2e7241f685e2df26849a0ad48 8286293: Tests ShortResponseBody and ShortResponseBodyWithRetry should use less resources May 18, 2022
@openjdk
Copy link

openjdk bot commented May 18, 2022

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

@openjdk openjdk bot added backport rfr labels May 18, 2022
@mlbridge
Copy link

mlbridge bot commented May 18, 2022

Webrevs

Copy link
Contributor

@TheRealMDoerr TheRealMDoerr left a comment

Adaptations LGTM. Please check missing removal of MSGS_ORDER.

@@ -372,82 +343,6 @@ public int read(byte[] buf, int offset, int length) {
static final List<String> MSGS_ORDER =
List.of("no bytes", "status line", "header");
Copy link
Contributor

@TheRealMDoerr TheRealMDoerr May 19, 2022

Choose a reason for hiding this comment

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

Original change removed this. Looks unused.

Copy link
Member Author

@GoeLin GoeLin May 20, 2022

Choose a reason for hiding this comment

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

Thanks for spotting this, fixed.

Copy link
Contributor

@TheRealMDoerr TheRealMDoerr left a comment

LGTM. Thanks!

@openjdk
Copy link

openjdk bot commented May 20, 2022

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

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

8286293: Tests ShortResponseBody and ShortResponseBodyWithRetry should use less resources

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

  • eb2d6b8: 8285523: Improve test java/io/FileOutputStream/OpenNUL.java
  • 4f29d1e: 8280684: JfrRecorderService failes with guarantee(num_written > 0) when no space left on device.
  • 39fd29f: 8240756: [macos] SwingSet2:TableDemo:Printed Japanese characters were garbled

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 label May 20, 2022
@GoeLin
Copy link
Member Author

GoeLin commented May 20, 2022

Thanks for the review!
/integrate

@openjdk
Copy link

openjdk bot commented May 20, 2022

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

  • eb2d6b8: 8285523: Improve test java/io/FileOutputStream/OpenNUL.java
  • 4f29d1e: 8280684: JfrRecorderService failes with guarantee(num_written > 0) when no space left on device.
  • 39fd29f: 8240756: [macos] SwingSet2:TableDemo:Printed Japanese characters were garbled

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated label May 20, 2022
@openjdk openjdk bot closed this May 20, 2022
@openjdk openjdk bot removed the ready label May 20, 2022
@GoeLin GoeLin deleted the goetz_backport_8286293 branch May 20, 2022
@openjdk openjdk bot removed the rfr label May 20, 2022
@openjdk
Copy link

openjdk bot commented May 20, 2022

@GoeLin Pushed as commit 2b75da6.

💡 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
2 participants