Skip to content
Open
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
9 changes: 4 additions & 5 deletions bedevere/prtype.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,10 @@ async def classify_by_filepaths(gh, pull_request, filenames):
else:
return pr_labels
if tests:
pr_labels = [Labels.tests]
pr_labels.append(Labels.tests)
elif docs:
if news:
pr_labels = [Labels.docs]
else:
pr_labels = [Labels.docs, Labels.skip_news]
pr_labels.append(Labels.docs)
if (tests or docs) and not news:
pr_labels.append(Labels.skip_news)
await add_labels(gh, issue, pr_labels)
return pr_labels
14 changes: 7 additions & 7 deletions tests/test_filepaths.py
Original file line number Diff line number Diff line change
Expand Up @@ -139,10 +139,12 @@ async def test_tests_only(author_association):
gh.getiter_url == "https://api.github.com/repos/cpython/python/pulls/1234/files"
)
assert gh.getitem_url == "https://api.github.com/repos/cpython/python/issue/1234"
assert len(gh.post_url) == 3 if author_association == "NONE" else 2
assert len(gh.post_url) == 1
assert gh.post_url.pop(0) == "https://api.github.com/some/label"
assert gh.post_data.pop(0) == [Labels.tests.value]
check_n_pop_nonews_events(gh, author_association == "NONE")
assert gh.post_data.pop(0) == [Labels.tests.value, Labels.skip_news.value]
# Don't post any comment
assert gh.post_url == []
assert gh.post_data == []


async def test_docs_and_tests():
Expand Down Expand Up @@ -176,12 +178,10 @@ async def test_docs_and_tests():
gh.getiter_url == "https://api.github.com/repos/cpython/python/pulls/1234/files"
)
assert gh.getitem_url == "https://api.github.com/repos/cpython/python/issue/1234"
# Only creates type-tests label.
assert len(gh.post_url) == 2
# Only creates tests label.
assert len(gh.post_url) == 1
assert gh.post_url[0] == "https://api.github.com/some/label"
assert gh.post_data[0] == [Labels.tests.value]
assert gh.post_url[1] == "https://api.github.com/some/status"
assert gh.post_data[1]["state"] == "success"


async def test_news_and_tests():
Expand Down
8 changes: 4 additions & 4 deletions tests/test_prtype.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ async def post(self, url, *, data):

async def test_no_files():
filenames = {}
issue = {"labels": []}
issue = {"labels": [], "labels_url": "https://api.github.com/some/label"}
gh = FakeGH(getitem=issue)
event_data = {
"action": "opened",
Expand Down Expand Up @@ -142,7 +142,7 @@ async def test_tests_only():
assert gh.getitem_url == "https://api.github.com/repos/cpython/python/issue/1234"
assert len(gh.post_url) == 1
assert gh.post_url[0] == "https://api.github.com/some/label"
assert gh.post_data[0] == [Labels.tests.value]
assert gh.post_data[0] == [Labels.tests.value, Labels.skip_news.value]


async def test_tests_and_testmods_only():
Expand All @@ -162,7 +162,7 @@ async def test_tests_and_testmods_only():
assert gh.getitem_url == "https://api.github.com/repos/cpython/python/issue/1234"
assert len(gh.post_url) == 1
assert gh.post_url[0] == "https://api.github.com/some/label"
assert gh.post_data[0] == [Labels.tests.value]
assert gh.post_data[0] == [Labels.tests.value, Labels.skip_news.value]


async def test_docs_and_tests():
Expand All @@ -183,7 +183,7 @@ async def test_docs_and_tests():
}
await prtype.classify_by_filepaths(gh, event_data["pull_request"], filenames)
assert gh.getitem_url == "https://api.github.com/repos/cpython/python/issue/1234"
# Only creates type-tests label.
# Only creates tests label.
assert len(gh.post_url) == 1
assert gh.post_url[0] == "https://api.github.com/some/label"
assert gh.post_data[0] == [Labels.tests.value]
Expand Down
Loading