Approved backport PR not merged whereas all CI tests passed

[vstinner]

Hi,

I approved the backport of my PR, but even after all CI tests passed, the backport PR was not merged: python/cpython#26290

I merged the PR manually.

The PR has 1 pending reviewer (markshannon), is it related? Is it required that all pending reviewers review backport PRs?

[Mariatta]

One of the tests have the status of "Skipped", instead of "Success".
Since it was not run, miss-islington could not merge it.

[vstinner]

One of the tests have the status of "Skipped", instead of "Success".

Would it be possible to modify the bot to merge the PR if jobs are skipped?

[DanielNoord]

I tested and these tests both work:

async def test_ci_passed_and_check_run_skipped_awaiting_merge_label_pr_is_merged():
    sha = "f2393593c99dd2d3ab8bfab6fcc5ddee540518a9"
    data = {"sha": sha, "commit": {"committer": {"login": "miss-islington"}}}
    event = sansio.Event(data, event="status", delivery_id="1")

    getitem = {
        f"/repos/python/cpython/commits/{sha}/status": {
            "state": "success",
            "statuses": [
                {
                    "state": "success",
                    "description": "Issue report skipped",
                    "context": "bedevere/issue-number",
                },
                {
                    "state": "success",
                    "description": "The Travis CI build passed",
                    "target_url": "https://travis-ci.org/python/cpython/builds/340259685?utm_source=github_status&utm_medium=notification",
                    "context": "continuous-integration/travis-ci/pr",
                },
            ],
        },
        "/repos/python/cpython/pulls/5544": {
            "user": {"login": "miss-islington"},
            "merged_by": {"login": "vstinner"},
        },
        "/repos/python/cpython/pulls/5547": {"labels": [{"name": "awaiting merge"}]},
        f"/search/issues?q=type:pr+repo:python/cpython+sha:{sha}": {
            "total_count": 1,
            "items": [
                {
                    "number": 5547,
                    "title": "[3.6] bpo-32720: Fixed the replacement field grammar documentation. (GH-5544)",
                    "body": "\n\n`arg_name` and `element_index` are defined as `digit`+ instead of `integer`.\n(cherry picked from commit 7a561afd2c79f63a6008843b83733911d07f0119)\n\nCo-authored-by: Mariatta <Mariatta@users.noreply.github.com>",
                    "labels": [{"name": "awaiting merge"}],
                }
            ],
        },
        f"/repos/python/cpython/commits/{sha}/check-runs": {
            "check_runs": [
                {
                    "conclusion": "skipped",
                    "name": "Travis CI - Pull Request",
                    "status": "completed",
                },
                {"conclusion": "success", "name": "Docs", "status": "completed"},
            ],
            "total_count": 2,
        },
    }

    getiter = {
        "/repos/python/cpython/pulls/5547/commits": [
            {
                "sha": "f2393593c99dd2d3ab8bfab6fcc5ddee540518a9",
                "commit": {
                    "message": "bpo-32720: Fixed the replacement field grammar documentation. (GH-5544)\n\n`arg_name` and `element_index` are defined as `digit`+ instead of `integer`.\n(cherry picked from commit 7a561afd2c79f63a6008843b83733911d07f0119)\n\nCo-authored-by: Mariatta <Mariatta@users.noreply.github.com>"
                },
            }
        ]
    }

    gh = FakeGH(getitem=getitem, getiter=getiter)
    await status_change.router.dispatch(event, gh)
    assert gh.put_data["sha"] == sha  # is merged
    assert gh.put_data["merge_method"] == "squash"
    assert (
        gh.put_data["commit_title"]
        == "bpo-32720: Fixed the replacement field grammar documentation. (GH-5544)"
    )
    assert (
        gh.put_data["commit_message"]
        == "\n`arg_name` and `element_index` are defined as `digit`+ instead of `integer`.\n(cherry picked from commit 7a561afd2c79f63a6008843b83733911d07f0119)\n\nCo-authored-by: Mariatta <Mariatta@users.noreply.github.com>"
    )

async def test_awaiting_merge_label_added_by_bedevere_and_ci_and_checks_passed_pr_is_merged():
    sha = "f2393593c99dd2d3ab8bfab6fcc5ddee540518a9"
    data = {
        "action": "labeled",
        "pull_request": {
            "user": {"login": "miss-islington"},
            "labels": [{"name": "awaiting merge"}],
            "head": {"sha": sha},
            "number": 5547,
            "title": "[3.6] bpo-32720: Fixed the replacement field grammar documentation. (GH-5544)",
            "body": "\n\n`arg_name` and `element_index` are defined as `digit`+ instead of `integer`.\n(cherry picked from commit 7a561afd2c79f63a6008843b83733911d07f0119)\n\nCo-authored-by: Mariatta <Mariatta@users.noreply.github.com>",
        },
        "sender": {"login": "bedevere-bot"},
        "label": {"name": "awaiting merge"},
    }

    event = sansio.Event(data, event="pull_request", delivery_id="1")

    getitem = {
        f"/repos/python/cpython/commits/{sha}/status": {
            "state": "success",
            "statuses": [
                {
                    "state": "success",
                    "description": "Issue report skipped",
                    "context": "bedevere/issue-number",
                },
                {
                    "state": "success",
                    "description": "The Travis CI build passed",
                    "target_url": "https://travis-ci.org/python/cpython/builds/340259685?utm_source=github_status&utm_medium=notification",
                    "context": "continuous-integration/travis-ci/pr",
                },
            ],
        },
        f"/repos/python/cpython/commits/{sha}/check-runs": {
            "check_runs": [
                {
                    "conclusion": "skipped",
                    "name": "Travis CI - Pull Request",
                    "status": "completed",
                },
                {"conclusion": "success", "name": "Docs", "status": "completed"},
            ],
            "total_count": 2,
        },
    }

    getiter = {
        "/repos/python/cpython/pulls/5547/commits": [
            {
                "sha": "f2393593c99dd2d3ab8bfab6fcc5ddee540518a9",
                "commit": {
                    "message": "bpo-32720: Fixed the replacement field grammar documentation. (GH-5544)\n\n`arg_name` and `element_index` are defined as `digit`+ instead of `integer`.\n(cherry picked from commit 7a561afd2c79f63a6008843b83733911d07f0119)\n\nCo-authored-by: Mariatta <Mariatta@users.noreply.github.com>"
                },
            }
        ]
    }

    gh = FakeGH(getitem=getitem, getiter=getiter)
    await status_change.router.dispatch(event, gh)
    assert not hasattr(gh, "post_data")  # does not leave a comment
    assert gh.put_data["sha"] == sha  # is merged
    assert gh.put_data["merge_method"] == "squash"
    assert (
        gh.put_data["commit_title"]
        == "bpo-32720: Fixed the replacement field grammar documentation. (GH-5544)"
    )
    assert (
        gh.put_data["commit_message"]
        == "\n`arg_name` and `element_index` are defined as `digit`+ instead of `integer`.\n(cherry picked from commit 7a561afd2c79f63a6008843b83733911d07f0119)\n\nCo-authored-by: Mariatta <Mariatta@users.noreply.github.com>"
    )

So both the status change and the labeling seem to work when any of the checks is "skipped". I haven't really found any other explanations for this failure.

[arhadthedev]

The issue manifests itself again. Here are examples of PRs that have no failing checks but were not merged by miss-islington:

• [3.11] Descriptor HowTo: Update to include attributes added in Python 3.10 (GH-103666) cpython#103680
• gh-81403: Fix for CacheFTPHandler in urllib cpython#13951
• [3.11] GH-103475: cache() and lru_cache() do not have a "call once" guarantee (GH-103669) cpython#103682

[arhadthedev]

I digged a little and now see that this is intended because gh-610 is merged. Probably, 🤖 automerge should be removed to not confuse core developers, followed by the rest of python/core-workflow#498 (comment).

[arhadthedev]

No longer relevant after python/core-workflow#498.