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

8230132: java/net/NetworkInterface/NetworkInterfaceRetrievalTests.java to skip Teredo Tunneling Pseudo-Interface #1953

Closed
wants to merge 1 commit into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Jun 18, 2023

I backport this for parity with 11.0.20-oracle.


Progress

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

Issue

  • JDK-8230132: java/net/NetworkInterface/NetworkInterfaceRetrievalTests.java to skip Teredo Tunneling Pseudo-Interface (Bug - P4)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1953

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 18, 2023

👋 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 1f87cb017ffb0a53c6a017b65b123ef568b8b2e7 8230132: java/net/NetworkInterface/NetworkInterfaceRetrievalTests.java to skip Teredo Tunneling Pseudo-Interface Jun 18, 2023
@openjdk
Copy link

openjdk bot commented Jun 18, 2023

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

@openjdk
Copy link

openjdk bot commented Jun 18, 2023

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

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

8230132: java/net/NetworkInterface/NetworkInterfaceRetrievalTests.java to skip Teredo Tunneling Pseudo-Interface

The test is updated to skip Teredo pseudo interfaces on windows.

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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 ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jun 18, 2023
@mlbridge
Copy link

mlbridge bot commented Jun 18, 2023

Webrevs

@GoeLin
Copy link
Member Author

GoeLin commented Jun 20, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Jun 20, 2023

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

  • 64c9026: 8300751: [17u] Remove duplicate entry in javac.properties
  • 2cc4596: 8293858: Change PKCS7 code to use default SecureRandom impl instead of SHA1PRNG
  • c1f759e: 8305815: Update Libpng to 1.6.39

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jun 20, 2023

@GoeLin Pushed as commit ade9973.

💡 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_8230132 branch June 20, 2023 19:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport clean integrated Pull request has been integrated
1 participant