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

8246741: NetworkInterface/UniqueMacAddressesTest: mac address uniqueness test failed #885

Closed
wants to merge 1 commit into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Mar 14, 2022

I backport this because it fixes a test failure we see on mac aarch.
I had to remove the record from the test UniqueMacAddressesTest.java


Progress

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

Issue

  • JDK-8246741: NetworkInterface/UniqueMacAddressesTest: mac address uniqueness test failed

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 885

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 14, 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 f5d36e6c9470b1ac5326990b1c4fea80457c4ad6 8246741: NetworkInterface/UniqueMacAddressesTest: mac address uniqueness test failed Mar 14, 2022
@openjdk
Copy link

openjdk bot commented Mar 14, 2022

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

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Mar 14, 2022
@mlbridge
Copy link

mlbridge bot commented Mar 14, 2022

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.

LGTM. Thanks for backporting!

@openjdk
Copy link

openjdk bot commented Mar 14, 2022

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

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

8246741: NetworkInterface/UniqueMacAddressesTest: mac address uniqueness test failed

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

  • f441970: 8223389: Shenandoah optimizations fail with assert(!phase->exceeding_node_budget())
  • f3708bb: 8225475: Node budget asserts on x86_32/64
  • 997c55f: 8283018: 11u GHA: Update GCC 9 minor versions
  • c94ce2c: 8210039: move OSInfo to top level testlibrary

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 Pull request is ready to be integrated label Mar 14, 2022
@GoeLin
Copy link
Member Author

GoeLin commented Mar 14, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Mar 14, 2022

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

  • 2ed46d8: 8211822: Some tests fail after JDK-8210039
  • f441970: 8223389: Shenandoah optimizations fail with assert(!phase->exceeding_node_budget())
  • f3708bb: 8225475: Node budget asserts on x86_32/64
  • 997c55f: 8283018: 11u GHA: Update GCC 9 minor versions
  • c94ce2c: 8210039: move OSInfo to top level testlibrary

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Mar 14, 2022
@openjdk openjdk bot closed this Mar 14, 2022
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Mar 14, 2022
@GoeLin GoeLin deleted the goetz_backport_8246741 branch March 14, 2022 14:08
@openjdk
Copy link

openjdk bot commented Mar 14, 2022

@GoeLin Pushed as commit ed275ba.

💡 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 Pull request has been integrated
2 participants