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

Add remove all labels option + reorganize cassettes #824

Merged
merged 4 commits into from
Mar 19, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions doc/source/actions.rst
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,10 @@ The ``label`` action can add or remove `labels
- list of string
- ``[]``
- The list of labels to remove.
* - ``remove_all``
- Boolean
- ``false``
- Remove all labels from the pull request.

.. _merge action:

Expand Down
14 changes: 9 additions & 5 deletions mergify_engine/actions/label.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ class LabelAction(actions.Action):
validator = {
voluptuous.Required("add", default=[]): [str],
voluptuous.Required("remove", default=[]): [str],
voluptuous.Required("remove_all", default=False): bool,
}

silent_report = True
Expand All @@ -40,10 +41,13 @@ def run(self, pull, sources, missing_conditions):

pull.g_pull.add_to_labels(*self.config["add"])

pull_labels = [l.name for l in pull.g_pull.labels]
for label in self.config["remove"]:
if label in pull_labels:
with utils.ignore_client_side_error():
pull.g_pull.remove_from_labels(label)
if self.config["remove_all"]:
pull.g_pull.delete_labels()
else:
pull_labels = [l.name for l in pull.g_pull.labels]
for label in self.config["remove"]:
if label in pull_labels:
with utils.ignore_client_side_error():
pull.g_pull.remove_from_labels(label)

return ("success", "Labels added/removed", "")
Empty file.
69 changes: 69 additions & 0 deletions mergify_engine/tests/functional/actions/test_label.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
# -*- encoding: utf-8 -*-
#
# Copyright © 2020 Julien Danjou <[email protected]>
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
import yaml

from mergify_engine.tests.functional import base


class TestLabelAction(base.FunctionalTestBase):
def test_label(self):
rules = {
"pull_request_rules": [
{
"name": "rename label",
"conditions": ["base=master", "label=stable"],
"actions": {
"label": {
"add": ["unstable", "foobar"],
"remove": ["stable", "what"],
}
},
}
]
}

self.setup_repo(yaml.dump(rules))

p, _ = self.create_pr()
self.add_label(p, "stable")

pulls = list(self.r_o_admin.get_pulls())
self.assertEqual(1, len(pulls))
self.assertEqual(
sorted(["unstable", "foobar"]), sorted([l.name for l in pulls[0].labels])
)

def test_label_remove_all(self):
rules = {
"pull_request_rules": [
{
"name": "delete all labels",
"conditions": ["base=master", "label=stable"],
"actions": {"label": {"remove_all": True,}},
}
]
}

self.setup_repo(yaml.dump(rules))

p, _ = self.create_pr()
self.add_label(p, "stable")

pulls = list(self.r_o_admin.get_pulls())
self.assertEqual(1, len(pulls))
self.assertEqual(
[], pulls[0].labels,
)
2 changes: 1 addition & 1 deletion mergify_engine/tests/functional/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ def setUp(self):
self.pr_counter = 0
self.git_counter = 0
self.cassette_library_dir = os.path.join(
CASSETTE_LIBRARY_DIR_BASE, self._testMethodName
CASSETTE_LIBRARY_DIR_BASE, self.__class__.__name__, self._testMethodName
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thx! I wanted to do that a long times ago and never did.

)

# Recording stuffs
Expand Down
27 changes: 0 additions & 27 deletions mergify_engine/tests/functional/test_engine.py
Original file line number Diff line number Diff line change
Expand Up @@ -245,33 +245,6 @@ def test_request_reviews_teams(self):
requests = pulls[0].get_review_requests()
self.assertEqual(sorted([team.slug]), sorted([l.slug for l in requests[1]]))

def test_label(self):
rules = {
"pull_request_rules": [
{
"name": "rename label",
"conditions": ["base=master", "label=stable"],
"actions": {
"label": {
"add": ["unstable", "foobar"],
"remove": ["stable", "what"],
}
},
}
]
}

self.setup_repo(yaml.dump(rules))

p, _ = self.create_pr()
self.add_label(p, "stable")

pulls = list(self.r_o_admin.get_pulls())
self.assertEqual(1, len(pulls))
self.assertEqual(
sorted(["unstable", "foobar"]), sorted([l.name for l in pulls[0].labels])
)

def test_debugger(self):
rules = {
"pull_request_rules": [
Expand Down
2 changes: 1 addition & 1 deletion mergify_engine/tests/functional/test_simulator.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
from mergify_engine.tests.functional import base


class TestEngineV2Scenario(base.FunctionalTestBase):
class TestSimulator(base.FunctionalTestBase):
"""Mergify engine tests.

Tests user github resource and are slow, so we must reduce the number
Expand Down
3 changes: 2 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,8 @@ show-source = true
select = C,E,F,W,B,B950
# E101,W191: Can't ignore tabs indent on multiline strings:
# https://gitlab.com/pycqa/flake8/issues/375
ignore = E501,W503,E203,G200,G201,E101,W191
# E231 and E203 are not respected by black
ignore = E501,W503,E203,G200,G201,E101,W191,E231
enable-extensions = G

[isort]
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[{"args": ["init"], "kwargs": {}, "out": "Initialized empty Git repository in /private/var/folders/sv/_9vpkb_93x37dh48kb6z8qf80000gn/T/mergify-gitterri5ltmex/.git/\n"}, {"args": ["config", "user.name", "mergify-bot"], "kwargs": {}, "out": ""}, {"args": ["config", "user.email", "[email protected]"], "kwargs": {}, "out": ""}, {"args": ["config", "credential.useHttpPath", "true"], "kwargs": {}, "out": ""}, {"args": ["config", "credential.helper", "cache --timeout=300 --socket=/tmp/mergify-gitter<random>/.git/creds/socket"], "kwargs": {}, "out": ""}, {"args": ["credential", "approve"], "kwargs": {"input": "url=https://<TOKEN>:@github.com/mergifyio-testing/repo-562cefae-5b09-467c-9fbc-dff3284edf68-test_label_remove_all\n\n"}, "out": ""}, {"args": ["credential", "approve"], "kwargs": {"input": "url=https://<TOKEN>:@github.com/mergify-test2/repo-562cefae-5b09-467c-9fbc-dff3284edf68-test_label_remove_all\n\n"}, "out": ""}, {"args": ["config", "user.name", "mergify-tester"], "kwargs": {}, "out": ""}, {"args": ["remote", "add", "main", "https://github.com/mergifyio-testing/repo-562cefae-5b09-467c-9fbc-dff3284edf68-test_label_remove_all"], "kwargs": {}, "out": ""}, {"args": ["remote", "add", "fork", "https://github.com/mergify-test2/repo-562cefae-5b09-467c-9fbc-dff3284edf68-test_label_remove_all"], "kwargs": {}, "out": ""}, {"args": ["add", ".mergify.yml"], "kwargs": {}, "out": ""}, {"args": ["commit", "--no-edit", "-m", "initial commit"], "kwargs": {}, "out": "[master (root-commit) 640380c] initial commit\n 1 file changed, 8 insertions(+)\n create mode 100644 .mergify.yml\n"}, {"args": ["push", "--quiet", "main", "master"], "kwargs": {}, "out": ""}, {"args": ["fetch", "--quiet", "fork"], "kwargs": {}, "out": ""}, {"args": ["checkout", "--quiet", "fork/master", "-b", "fork/pr1"], "kwargs": {}, "out": ""}, {"args": ["add", "test1"], "kwargs": {}, "out": ""}, {"args": ["commit", "--no-edit", "-m", "Pull request n1 from fork"], "kwargs": {}, "out": "[fork/pr1 559f9f3] Pull request n1 from fork\n 1 file changed, 0 insertions(+), 0 deletions(-)\n create mode 100644 test1\n"}, {"args": ["push", "--quiet", "fork", "fork/pr1"], "kwargs": {}, "out": "remote: \nremote: Create a pull request for 'fork/pr1' on GitHub by visiting: \nremote: https://github.com/mergify-test2/repo-562cefae-5b09-467c-9fbc-dff3284edf68-test_label_remove_all/pull/new/fork/pr1 \nremote: \n"}, {"args": ["credential-cache", "--socket=/tmp/mergify-gitter<random>/.git/creds/socket", "exit"], "kwargs": {}, "out": ""}]
Loading