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

8278456: Define jtreg jdk_desktop test group time-based sub-tasks for use by headful testing. #2164

Closed
wants to merge 2 commits into from

Conversation

amosshi
Copy link
Contributor

@amosshi amosshi commented Oct 3, 2023


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
  • JDK-8278456 needs maintainer approval

Issue

  • JDK-8278456: Define jtreg jdk_desktop test group time-based sub-tasks for use by headful testing. (Bug - P4 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2164

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 3, 2023

👋 Welcome back amosshi! 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 81c56c700a47c7f1b7855052de17eb88fac84674 8278456: Define jtreg jdk_desktop test group time-based sub-tasks for use by headful testing. Oct 3, 2023
@openjdk
Copy link

openjdk bot commented Oct 3, 2023

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

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Oct 3, 2023
@mlbridge
Copy link

mlbridge bot commented Oct 3, 2023

Webrevs

Fix the test case error:
- testdata/jtreg/jtreg_test_11/test/jdk/TEST.groups: group jdk_desktop_part1: group not found: jdk_accessibility

Reason
- https://bugs.openjdk.org/browse/JDK-8236044 added a new group jdk_accessibility

Solution
- Add a `jdk_accessibility` placeholder
- When this change back ported later, can add the contents of https://hg.openjdk.org/jdk/jdk14/rev/66ddad9cdd9d
@amosshi
Copy link
Contributor Author

amosshi commented Oct 15, 2023

/approval request "Backporting for parity with jdk11.0.21-oracle. No risk, test fix. Clean backport. Test passes and SAP nightlies pass.”

@openjdk
Copy link

openjdk bot commented Oct 15, 2023

@amosshi
8278456: The approval request has been created successfully.

@openjdk openjdk bot added the approval label Oct 15, 2023
@GoeLin
Copy link
Member

GoeLin commented Oct 15, 2023

The edit was needed because 8236044: Create jdk_accessibility test group is not in 11.
Also, jdk_client_sanity was not part of jdk_desktop in 11.

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

@openjdk
Copy link

openjdk bot commented Oct 15, 2023

⚠️ @amosshi 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.

@amosshi
Copy link
Contributor Author

amosshi commented Oct 15, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Oct 15, 2023

@amosshi This pull request has not yet been marked as ready for integration.

@amosshi
Copy link
Contributor Author

amosshi commented Oct 16, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Oct 16, 2023

@amosshi This pull request has not yet been marked as ready for integration.

@openjdk
Copy link

openjdk bot commented Oct 17, 2023

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

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

8278456: Define jtreg jdk_desktop test group time-based sub-tasks for use by headful testing.

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 38 new commits pushed to 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.

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 ready Pull request is ready to be integrated and removed approval labels Oct 17, 2023
@amosshi
Copy link
Contributor Author

amosshi commented Oct 18, 2023

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Oct 18, 2023
@openjdk
Copy link

openjdk bot commented Oct 18, 2023

@amosshi
Your change (at version ce3c4ac) is now ready to be sponsored by a Committer.

@GoeLin
Copy link
Member

GoeLin commented Oct 19, 2023

/sponsor

@openjdk
Copy link

openjdk bot commented Oct 19, 2023

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

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Oct 19, 2023

@GoeLin @amosshi Pushed as commit 21536b0.

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

@amosshi amosshi deleted the backport-8278456 branch October 19, 2023 22:51
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