Skip to content
This repository has been archived by the owner. It is now read-only.

8271350: runtime/Safepoint tests use OutputAnalyzer::shouldMatch instead of shouldContaint #285

Closed
wants to merge 1 commit into from

Conversation

iignatev
Copy link
Member

@iignatev iignatev commented Jul 27, 2021

Hi all,

could you please review this small patch?

from JBS:

runtime/Safepoint/TestAbortVMOnSafepointTimeout.java and TestAbortOnVMOperationTimeout.java tests use j.t.l.p.OutputAnalyzer::shouldMatch method, which accepts a regular expression, yet pass a fixed string as an argument.

testing: ``runtime/Safepoint/on{windows,linux,macos}-x64`

Thanks,
-- Igor


Progress

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

Issue

  • JDK-8271350: runtime/Safepoint tests use OutputAnalyzer::shouldMatch instead of shouldContaint

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk17 pull/285/head:pull/285
$ git checkout pull/285

Update a local copy of the PR:
$ git checkout pull/285
$ git pull https://git.openjdk.java.net/jdk17 pull/285/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 285

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk17/pull/285.diff

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Jul 27, 2021

👋 Welcome back iignatyev! 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 8271350 8271350: runtime/Safepoint tests use OutputAnalyzer::shouldMatch instead of shouldContaint Jul 27, 2021
@openjdk openjdk bot added the rfr label Jul 27, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Jul 27, 2021

@iignatev The following label will be automatically applied to this pull request:

  • hotspot-runtime

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the hotspot-runtime label Jul 27, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Jul 27, 2021

Webrevs

Copy link
Member

@mseledts mseledts left a comment

Change looks good to me.

Copy link
Member

@dholmes-ora dholmes-ora left a comment

This doesn't really make any difference but okay.

@openjdk
Copy link

@openjdk openjdk bot commented Jul 27, 2021

@iignatev 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:

8271350: runtime/Safepoint tests use OutputAnalyzer::shouldMatch instead of shouldContaint

Reviewed-by: mseledtsov, dholmes

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:

  • fbe28e4: 8270866: NPE in DocTreePath.getTreePath()
  • f662127: 8270491: SEGV at read_string_field(oopDesc*, char const*, JavaThread*)+0x54
  • cea7bc2: 8271223: two runtime/ClassFile tests don't check exit code
  • b76a838: 8269150: UnicodeReader not translating \u005c\u005d to \]
  • 7ddabbf: 8271175: runtime/jni/FindClassUtf8/FindClassUtf8.java doesn't have to be run in othervm
  • 3c27f91: 8271222: two runtime/Monitor tests don't check exit code
  • 049b2ad: 8015886: java/awt/Focus/DeiconifiedFrameLoosesFocus/DeiconifiedFrameLoosesFocus.java sometimes failed on ubuntu
  • 8adf008: 8269984: [macos] JTabbedPane title looks like disabled

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 Jul 27, 2021
@iignatev
Copy link
Member Author

@iignatev iignatev commented Jul 27, 2021

This doesn't really make any difference but okay.
in case of Timed out while spinning to reach a safepoint., it does ;)

thanks for the reviews!

-- Igor

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Jul 27, 2021

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

  • fbe28e4: 8270866: NPE in DocTreePath.getTreePath()
  • f662127: 8270491: SEGV at read_string_field(oopDesc*, char const*, JavaThread*)+0x54
  • cea7bc2: 8271223: two runtime/ClassFile tests don't check exit code
  • b76a838: 8269150: UnicodeReader not translating \u005c\u005d to \]
  • 7ddabbf: 8271175: runtime/jni/FindClassUtf8/FindClassUtf8.java doesn't have to be run in othervm
  • 3c27f91: 8271222: two runtime/Monitor tests don't check exit code
  • 049b2ad: 8015886: java/awt/Focus/DeiconifiedFrameLoosesFocus/DeiconifiedFrameLoosesFocus.java sometimes failed on ubuntu
  • 8adf008: 8269984: [macos] JTabbedPane title looks like disabled

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Jul 27, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Jul 27, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Jul 27, 2021

@iignatev Pushed as commit f1e15c8.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@iignatev iignatev deleted the 8271350 branch Jul 28, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
hotspot-runtime integrated
3 participants