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

8315415: OutputAnalyzer.shouldMatchByLine() fails in some cases #2505

Closed

Conversation

luchenlin
Copy link
Contributor

@luchenlin luchenlin commented Feb 2, 2024

I backport this for parity with 11.0.23-oracle.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • JDK-8315415 needs maintainer approval

Issue

  • JDK-8315415: OutputAnalyzer.shouldMatchByLine() fails in some cases (Bug - P4 - Approved)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2505

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Feb 2, 2024

👋 Welcome back andrewlu! 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 7b1e2bfe0f805a69b59839b6bf8250b62ea356b8 8315415: OutputAnalyzer.shouldMatchByLine() fails in some cases Feb 2, 2024
@openjdk
Copy link

openjdk bot commented Feb 2, 2024

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

@openjdk
Copy link

openjdk bot commented Feb 2, 2024

⚠️ @luchenlin This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@openjdk openjdk bot added the rfr Pull request is ready for review label Feb 2, 2024
@mlbridge
Copy link

mlbridge bot commented Feb 2, 2024

Webrevs

@openjdk openjdk bot added the approval label Feb 5, 2024
@openjdk
Copy link

openjdk bot commented Feb 5, 2024

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

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

8315415: OutputAnalyzer.shouldMatchByLine() fails in some cases

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 and removed approval labels Feb 5, 2024
@luchenlin
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Feb 6, 2024

Going to push as commit 38c11fd.
Since your change was applied there has been 1 commit pushed to the master branch:

  • 0dc17ca: 8315731: Open source several Swing Text related tests

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Feb 6, 2024

@luchenlin Pushed as commit 38c11fd.

💡 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 clean integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

1 participant