-
Notifications
You must be signed in to change notification settings - Fork 5.3k
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
JDK-8314517: some tests fail in case ipv6 is disabled on the machine #15341
Conversation
👋 Welcome back mbaesken! A progress list of the required criteria for merging this PR into |
Webrevs
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks reasonable.
@MBaesken This change now passes all automated pre-integration checks. ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details. After integration, the commit message for the final commit will be:
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 60 new commits pushed to the
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 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM.
Testing IPV6 only if it is available for sure makes sense.
System.err.printf("Expected addresses:%n%s%n", Arrays.deepToString(expectedAddresses)); | ||
System.err.printf("Resolved addresses:%n%s%n", Arrays.deepToString(resolvedAddresses)); | ||
Assert.fail("Wrong host resolution result is returned"); | ||
if (IPSupport.hasIPv6()) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hello Matthias, unlike changes to some other tests, this skips the entire test method if there's no IPv6 support. So perhaps add a System.out message that this test is skipped? I checked if testng
has assumeTrue
kind of API like junit, but I couldn't find any, so just returning by printing a System.out message might be enough.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Some of the test runs should work whether the machine has IPv6 or not. Maybe this test should be more selective with respect to when the test should be skipped. For instance at line 47-48:
* @run testng/othervm -Djdk.net.hosts.file=TestHostsFile.txt
* -Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false HostsFileOrderingTest
well - that should work - and only return IPv4 addresses.
On second thought - I suspect it's getExpectedAddressesArray()
that should be fixed to take into account IPSupport.hasIPv6() instead of doing it here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've added a trivial review comment about one of the test method changes. Other than that, these changes look OK to me.
Hi Daniel and Jaikiran, I adjusted the HostsFileOrderingTest.java a bit. |
Hi Matthias, this looks much better. Let me give it whirl on the CI to double check there's not unexpected side effects. |
Sounds good, thanks ! |
The latest version worked nicely in our tests; any issues seen in your CI ? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Thanks for the reviews! /integrate |
Going to push as commit 703817d.
Your commit was automatically rebased without conflicts. |
Some jtreg tests fail with ipv6 disabled on the machine, this should be improved in the tests (e.g. by using IPSupport.hasIPv6() ).
Progress
Issue
Reviewers
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/15341/head:pull/15341
$ git checkout pull/15341
Update a local copy of the PR:
$ git checkout pull/15341
$ git pull https://git.openjdk.org/jdk.git pull/15341/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 15341
View PR using the GUI difftool:
$ git pr show -t 15341
Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/15341.diff
Webrev
Link to Webrev Comment