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

8229486: Replace wildcard address with loopback or local host in tests - part 21 #902

Closed
wants to merge 1 commit into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Mar 16, 2022

I backport this for parity with 11.0.16-oracle.

TcpKeepAliveTest.java does not apply because
8220083: Use InetAddress.getLoopbackAddress() in place of 127.0.0.1 f...
is missing

SetIfModifiedSince.java does not apply because
8226756: Replace wildcard address with loopback or local host in tests - part 18
is missing.

I included the respective previous changes to these two files in this patch. Backporting these larger
dependencies will cause recursive backports or require resolving. I want to avoid this additional
effort. In case backports of these other changes are necessary later, one will just have to
skip the patches to the corresponding files. As the changes are quite simple, this should
be easy enough to do.


Progress

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

Issue

  • JDK-8229486: Replace wildcard address with loopback or local host in tests - part 21

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 902

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Mar 16, 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 77d09f0f14bdaafa2e3528c73ee2287338e2ad49 8229486: Replace wildcard address with loopback or local host in tests - part 21 Mar 16, 2022
@openjdk
Copy link

@openjdk openjdk bot commented Mar 16, 2022

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

@openjdk openjdk bot added backport rfr labels Mar 16, 2022
@mlbridge
Copy link

@mlbridge mlbridge bot commented Mar 16, 2022

Webrevs

@TheRealMDoerr
Copy link
Contributor

@TheRealMDoerr TheRealMDoerr commented Mar 17, 2022

For reference: parts of these changes were integrated: openjdk/jdk@ef9ce3b openjdk/jdk@76785af

Copy link
Contributor

@TheRealMDoerr TheRealMDoerr left a comment

Taking these parts makes sense IMHO. LGTM.

@openjdk
Copy link

@openjdk openjdk bot commented Mar 17, 2022

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

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

8229486: Replace wildcard address with loopback or local host in tests - part 21

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

  • b42dd74: 8280476: [macOS] : hotspot arm64 bug exposed by latest clang
  • 73dc222: 8257794: Zero: assert(istate->_stack_limit == istate->_thread->last_Java_sp() + 1) failed: wrong on Linux/x86_32
  • 6135540: 8223396: [TESTBUG] several jfr tests do not clean up files created in /tmp
  • 9543488: 8247592: refactor test/jdk/tools/launcher/Test7029048.java
  • 62afe2e: 8166727: javac crashed: [jimage.dll+0x1942] ImageStrings::find+0x28
  • e1b2f92: 8279356: Method linking fails with guarantee(mh->adapter() != NULL) failed: Adapter blob must already exist!
  • 38e44eb: 8199874: [TESTBUG] runtime/Thread/ThreadPriorities.java fails with "expected 0 to equal 10"
  • ebf6a5b: 8207364: nsk/jvmti/ResourceExhausted/resexhausted003 fails to start

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 Mar 17, 2022
@GoeLin
Copy link
Member Author

@GoeLin GoeLin commented Mar 18, 2022

Pre-submit failure: runtime/Thread/StopAtExit.java fixed in jdk11u

@GoeLin
Copy link
Member Author

@GoeLin GoeLin commented Mar 18, 2022

Thanks for the reivew
/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Mar 18, 2022

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

  • dbd14f7: 8277422: tools/jar/JarEntryTime.java fails with modified time mismatch
  • dfcef29: 8241707: introduce randomness k/w to hotspot test suite
  • b42dd74: 8280476: [macOS] : hotspot arm64 bug exposed by latest clang
  • 73dc222: 8257794: Zero: assert(istate->_stack_limit == istate->_thread->last_Java_sp() + 1) failed: wrong on Linux/x86_32
  • 6135540: 8223396: [TESTBUG] several jfr tests do not clean up files created in /tmp
  • 9543488: 8247592: refactor test/jdk/tools/launcher/Test7029048.java
  • 62afe2e: 8166727: javac crashed: [jimage.dll+0x1942] ImageStrings::find+0x28
  • e1b2f92: 8279356: Method linking fails with guarantee(mh->adapter() != NULL) failed: Adapter blob must already exist!
  • 38e44eb: 8199874: [TESTBUG] runtime/Thread/ThreadPriorities.java fails with "expected 0 to equal 10"
  • ebf6a5b: 8207364: nsk/jvmti/ResourceExhausted/resexhausted003 fails to start

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated label Mar 18, 2022
@openjdk openjdk bot closed this Mar 18, 2022
@openjdk openjdk bot removed ready rfr labels Mar 18, 2022
@GoeLin GoeLin deleted the goetz_backport_8229486 branch Mar 18, 2022
@openjdk
Copy link

@openjdk openjdk bot commented Mar 18, 2022

@GoeLin Pushed as commit 306d863.

💡 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