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

update-sync labels should be applied to all-bar-one records #848

Closed
wants to merge 1 commit into from

Conversation

robm-openjdk
Copy link
Member

@robm-openjdk robm-openjdk commented Sep 25, 2020

This modification fixes the situation where a backport record may be a member
of two distinct streams and has its hgupdate-sync label removed as a result.

E.g. with backport records for 14, 15, 14.0.1, 15.0.1 no label would be
applied to 15. The current logic gives precedence to the fact that it is the
first release in the 15-updates stream and ignores the fact that it is not
the first release in the feature stream. The label added by the feature stream
is removed when evaluating the 15-updates stream. This should not be the case.


Progress

  • Change must not contain extraneous whitespace
  • Change must be properly reviewed

Reviewers

Download

$ git fetch https://git.openjdk.java.net/skara pull/848/head:pull/848
$ git checkout pull/848

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Sep 25, 2020

👋 Welcome back robm! 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 added the rfr label Sep 25, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Sep 25, 2020

@robm-openjdk The following label will be automatically applied to this pull request: bots.

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 (add|remove) "label" command.

@openjdk openjdk bot added the bots label Sep 25, 2020
@mlbridge
Copy link

@mlbridge mlbridge bot commented Sep 25, 2020

Webrevs

@robm-openjdk
Copy link
Member Author

@robm-openjdk robm-openjdk commented Sep 25, 2020

@kevinrushforth - it'd be great if you could take a look at this when you're able.

Copy link
Member

@rwestberg rwestberg left a comment

Looks good to me, thanks for fixing! Perhaps @kevinrushforth would like to take a look as well though.

@openjdk
Copy link

@openjdk openjdk bot commented Sep 28, 2020

@robm-openjdk 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 more details.

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

update-sync labels should be applied to all-bar-one records

Reviewed-by: rwestberg, kcr

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 21 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 (@rwestberg) 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 label Sep 28, 2020
Copy link
Member

@kevinrushforth kevinrushforth left a comment

The fix looks good to me. One question about the test: is the assertNotLabeled method really needed? It looks like assertLabeled will fail unless the set of issues with the labels is exactly as expected (i.e., it will fail if it finds an issue that should have the sync label but doesn't or if if find an issue that should not have the sync label but does), unless I'm missing something.

@robm-openjdk
Copy link
Member Author

@robm-openjdk robm-openjdk commented Sep 29, 2020

I think I like the lack of ambiguity in the name. I vote to leave it in, but if Robin objects I can remove it.

@robm-openjdk
Copy link
Member Author

@robm-openjdk robm-openjdk commented Sep 29, 2020

/integrate

@openjdk openjdk bot added the sponsor label Sep 29, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Sep 29, 2020

@robm-openjdk
Your change (at version 42d8128) is now ready to be sponsored by a Committer.

@rwestberg
Copy link
Member

@rwestberg rwestberg commented Sep 30, 2020

I don't mind keeping it if you think it makes the test more readable!

@rwestberg
Copy link
Member

@rwestberg rwestberg commented Sep 30, 2020

/sponsor

@openjdk
Copy link

@openjdk openjdk bot commented Sep 30, 2020

@rwestberg @robm-openjdk Since your change was applied there have been 21 commits pushed to the master branch:

Your commit was automatically rebased without conflicts.

Pushed as commit f023a34.

💡 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
3 participants