Skip to content

8340279: Open source several AWT Dialog tests - Batch 2#21466

Closed
TejeshR13 wants to merge 3 commits intoopenjdk:masterfrom
TejeshR13:branch_8340279
Closed

8340279: Open source several AWT Dialog tests - Batch 2#21466
TejeshR13 wants to merge 3 commits intoopenjdk:masterfrom
TejeshR13:branch_8340279

Conversation

@TejeshR13
Copy link
Contributor

@TejeshR13 TejeshR13 commented Oct 11, 2024

Open source these AWT Dialog tests:

java/awt/Dialog/PrintToFileTest/PrintToFileRevoked.java
java/awt/Dialog/PrintToFileTest/PrintToFileGranted.java
java/awt/Dialog/TopmostModalDialogTest.java
java/awt/Dialog/FileDialogFilterTest.java
java/awt/Dialog/DialogSystemMenu/DialogSystemMenu.java


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

Warnings

 ⚠️ Patch contains a binary file (test/jdk/java/awt/Dialog/DialogSystemMenu/icon24x24.gif)
 ⚠️ Patch contains a binary file (test/jdk/java/awt/Dialog/DialogSystemMenu/iconone.gif)
 ⚠️ Patch contains a binary file (test/jdk/java/awt/Dialog/DialogSystemMenu/icontwo.gif)

Issue

  • JDK-8340279: Open source several AWT Dialog tests - Batch 2 (Bug - P4) ⚠️ Issue is already resolved. Consider making this a "backport pull request" by setting the PR title to Backport <hash> with the hash of the original commit. See Backports.

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/21466/head:pull/21466
$ git checkout pull/21466

Update a local copy of the PR:
$ git checkout pull/21466
$ git pull https://git.openjdk.org/jdk.git pull/21466/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 21466

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/21466.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 11, 2024

👋 Welcome back tr! 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
Copy link

openjdk bot commented Oct 11, 2024

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

8340279: Open source several AWT Dialog tests - Batch 2

Reviewed-by: abhiscxk, prr

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
Copy link

openjdk bot commented Oct 11, 2024

@TejeshR13 this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout branch_8340279
git fetch https://git.openjdk.org/jdk.git master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk openjdk bot added merge-conflict Pull request has merge conflict with target branch rfr Pull request is ready for review labels Oct 11, 2024
@openjdk
Copy link

openjdk bot commented Oct 11, 2024

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

  • client

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 client client-libs-dev@openjdk.org label Oct 11, 2024
@mlbridge
Copy link

mlbridge bot commented Oct 11, 2024

Webrevs

@DamonGuy
Copy link
Contributor

@TejeshR13 Seems like you have a merge-conflict that you should resolve since this involves the Problem list.

@TejeshR13
Copy link
Contributor Author

@TejeshR13 Seems like you have a merge-conflict that you should resolve since this involves the Problem list.

Yeah, have resolved it now.

@openjdk openjdk bot removed the merge-conflict Pull request has merge conflict with target branch label Oct 14, 2024
@openjdk openjdk bot added the ready Pull request is ready to be integrated label Oct 15, 2024
@TejeshR13
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Oct 17, 2024

@TejeshR13 Since your change was applied there have been 57 commits pushed to the master branch:

It was not possible to rebase your changes automatically. Please merge master into your branch and try again.

@openjdk openjdk bot added merge-conflict Pull request has merge conflict with target branch and removed ready Pull request is ready to be integrated labels Oct 17, 2024
@openjdk openjdk bot removed the merge-conflict Pull request has merge conflict with target branch label Oct 17, 2024
@openjdk openjdk bot added the ready Pull request is ready to be integrated label Oct 17, 2024
@TejeshR13
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Oct 17, 2024

Going to push as commit e0dabfb.

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

openjdk bot commented Oct 17, 2024

@TejeshR13 Pushed as commit e0dabfb.

💡 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

client client-libs-dev@openjdk.org integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

4 participants