Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Prev Previous commit
Next Next commit
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
  • Loading branch information
pre-commit-ci[bot] authored and Qalthos committed Apr 5, 2023
commit 88c65fd91d9248f49c819aed22a63cf18a4223a5
5 changes: 2 additions & 3 deletions .github/actions/checkout_repository/resolve_dependency.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

from github import Github


FORMAT = "[%(asctime)s] - %(message)s"
logging.basicConfig(format=FORMAT)
logger = logging.getLogger("resolve_dependency")
Expand Down Expand Up @@ -51,9 +52,7 @@ def main() -> None:

# get pull request merge commit sha
merge_commit_sha = get_pr_merge_commit_sha(repository, pr_number)
logger.info(
"merge commit sha for pull request %d => '%s'", pr_number, merge_commit_sha
)
logger.info("merge commit sha for pull request %d => '%s'", pr_number, merge_commit_sha)
github_output = os.environ.get("GITHUB_OUTPUT")
if github_output:
with open(str(github_output), "a", encoding="utf-8") as file_handler:
Expand Down
29 changes: 13 additions & 16 deletions .github/actions/checkout_repository/test_resolve_dependency.py
Original file line number Diff line number Diff line change
@@ -1,50 +1,49 @@
#!/usr/bin/env python3

import pytest
import os
import string

from random import choice
from unittest.mock import MagicMock, patch
from unittest.mock import MagicMock
from unittest.mock import patch

from resolve_dependency import (
get_pr_merge_commit_sha,
resolve_ref,
main
)
import pytest

from resolve_dependency import get_pr_merge_commit_sha
from resolve_dependency import main
from resolve_dependency import resolve_ref


@pytest.mark.parametrize(
"pr_body,match",
[
("Depends-On: https://github.com/my_org/my_collection/pull/12345", True),
(
"Depends-On: https://github.com/my_org/my_collection/pull/12345\n"\
"Depends-On: https://github.com/my_org/my_collection/pull/12345\n"
"Depends-On: https://github.com/my_org/my_collection/pull/67890",
True,
),
(
"Depends-On: https://github.com/another_org/my_collection/pull/4000\n"\
"Depends-On: https://github.com/another_org/my_collection/pull/4000\n"
"Depends-On: https://github.com/my_org/my_collection/pull/12345",
True,
),
(
"Depends-On: https://github.com/my_org/my_collection/pull/12345\n"\
"Depends-On: https://github.com/my_org/my_collection/pull/12345\n"
"Depends-On: https://github.com/my_org/my_collection/pull/67890",
True,
),
("Depends-On: https://github.com/another_org/my_collection/pull/12345", False),
("Depends-On: https://github.com/my_org/my_collection2/pull/12345", False),
("Depends-On: https://github.com/my_org/my_collection/pull", False),
]
],
)
def test_resolve_ref(pr_body, match):

expected = 12345 if match else 0
assert resolve_ref(pr_body, "my_org/my_collection") == expected


class FakePullRequest(object):

class FakePullRequest:
def __init__(self, mergeable):
self.mergeable = mergeable
self.merge_commit_sha = self.generate_commit_sha()
Expand All @@ -58,7 +57,6 @@ def generate_commit_sha(length=16):
@pytest.mark.parametrize("mergeable", [True, False])
@patch("resolve_dependency.Github")
def test_get_pr_merge_commit_sha(m_Github, mergeable):

m_github_obj = MagicMock()
m_Github.return_value = m_github_obj

Expand Down Expand Up @@ -91,7 +89,6 @@ def test_get_pr_merge_commit_sha(m_Github, mergeable):
@patch("resolve_dependency.get_pr_merge_commit_sha")
@patch("resolve_dependency.resolve_ref")
def test_main(m_resolve_ref, m_get_pr_merge_commit_sha, repository, resolve_ref_pr, tmp_path):

pr_body = "My pull request body - this is a sample for unit tests"
repository_name = "my_test_repository"
os.environ["RESOLVE_REF_PR_BODY"] = pr_body
Expand Down