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

8266460: java.io tests fail on null stream with upgraded jtreg/TestNG #1254

Closed
wants to merge 1 commit into from

Conversation

gdams
Copy link
Member

@gdams gdams commented Jul 21, 2022

Backport required to bump JDK11u to jtreg 6

test/jdk/java/io/InputStream/NullInputStream.java

  • no import java.io.EOFException; in jdk11u which prevented the patch from applying cleanly.

Progress

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

Issue

  • JDK-8266460: java.io tests fail on null stream with upgraded jtreg/TestNG

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1254

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Jul 21, 2022

👋 Welcome back gdams! 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 e8405970b9998ff8f77bcf196f1456713a98c47f 8266460: java.io tests fail on null stream with upgraded jtreg/TestNG Jul 21, 2022
@openjdk
Copy link

openjdk bot commented Jul 21, 2022

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

@openjdk openjdk bot added the backport label Jul 21, 2022
@gdams gdams mentioned this pull request Jul 21, 2022
3 tasks
@openjdk openjdk bot added the rfr Pull request is ready for review label Jul 21, 2022
@mlbridge
Copy link

mlbridge bot commented Jul 21, 2022

Webrevs

@gdams
Copy link
Member Author

gdams commented Jul 21, 2022

@GoeLin please can you review and then I'll kick off the integration

@GoeLin
Copy link
Member

GoeLin commented Jul 21, 2022

@gdams, you should not label jdk11u-fix-request before you have the review. Also, it is helpful to know what you changed. You should write that in the comment. For example, see PR 1244.

@gdams
Copy link
Member Author

gdams commented Jul 21, 2022

@gdams, you should not label jdk11u-fix-request before you have the review. Also, it is helpful to know what you changed. You should write that in the comment. For example, see PR 1244.

@GoeLin apologies I've got the order mixed up, I'll update the comment with a list of what's changed

Copy link
Member

@GoeLin GoeLin left a comment

Choose a reason for hiding this comment

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

LGTM.
Some methods are missing in NullInputStream.java becasue
"6516099: InputStream.skipFully(int k) to skip exactly k bytes" is not in 17.
so the corresponding patches are omitted.

@openjdk
Copy link

openjdk bot commented Jul 21, 2022

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

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

8266460: java.io tests fail on null stream with upgraded jtreg/TestNG

Reviewed-by: goetz

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

  • 664f2ab: 8282280: Update Xerces to Version 2.12.2
  • 13b4420: 8271010: vmTestbase/gc/lock/malloc/malloclock04/TestDescription.java crashes intermittently
  • 517a18e: 8288360: CI: ciInstanceKlass::implementor() is not consistent for well-known classes
  • 9d8e388: 8208471: nsk/jdb/unwatch/unwatch002/unwatch002.java fails with "Prompt is not received during 300200 milliseconds"
  • 11eed37: 8266774: System property values for stdout/err on Windows UTF-8
  • 77d9210: 8289486: Improve XSLT XPath operators count efficiency
  • d3a4879: 8281738: Create a regression test for checking the 'Space' key activation of focused Button
  • a240a9e: 8281988: Create a regression test for JDK-4618767
  • ac3893c: 8281745: Create a regression test for JDK-4514331
  • a0edf35: 8281535: Create a regression test for JDK-4670051
  • ... and 1 more: https://git.openjdk.org/jdk11u-dev/compare/1f4028960a3934853104efd1d95991b137b5f520...master

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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@GoeLin) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jul 21, 2022
@gdams
Copy link
Member Author

gdams commented Jul 21, 2022

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Jul 21, 2022
@openjdk
Copy link

openjdk bot commented Jul 21, 2022

@gdams
Your change (at version 741f4ae) is now ready to be sponsored by a Committer.

@GoeLin
Copy link
Member

GoeLin commented Jul 21, 2022

/sponsor

@openjdk
Copy link

openjdk bot commented Jul 21, 2022

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

  • 533a4e6: 8266250: WebSocketTest and WebSocketProxyTest call assertEquals(List<byte[]>, List<byte[]>)
  • 664f2ab: 8282280: Update Xerces to Version 2.12.2
  • 13b4420: 8271010: vmTestbase/gc/lock/malloc/malloclock04/TestDescription.java crashes intermittently
  • 517a18e: 8288360: CI: ciInstanceKlass::implementor() is not consistent for well-known classes
  • 9d8e388: 8208471: nsk/jdb/unwatch/unwatch002/unwatch002.java fails with "Prompt is not received during 300200 milliseconds"
  • 11eed37: 8266774: System property values for stdout/err on Windows UTF-8
  • 77d9210: 8289486: Improve XSLT XPath operators count efficiency
  • d3a4879: 8281738: Create a regression test for checking the 'Space' key activation of focused Button
  • a240a9e: 8281988: Create a regression test for JDK-4618767
  • ac3893c: 8281745: Create a regression test for JDK-4514331
  • ... and 2 more: https://git.openjdk.org/jdk11u-dev/compare/1f4028960a3934853104efd1d95991b137b5f520...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Jul 21, 2022
@openjdk openjdk bot closed this Jul 21, 2022
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Jul 21, 2022
@gdams gdams deleted the testng branch July 21, 2022 12:35
@openjdk
Copy link

openjdk bot commented Jul 21, 2022

@GoeLin @gdams Pushed as commit 16a84de.

💡 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