Skip to content

Commit

Permalink
fix(tests): skip required_conversation_resolution tests on GHES (#4397)
Browse files Browse the repository at this point in the history
Change-Id: I2846a252000cfe509f5be2c62668988d65fa7ae3
  • Loading branch information
sileht authored Apr 6, 2022
1 parent 8b5b0d5 commit 3d034e2
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions mergify_engine/tests/functional/actions/test_merge.py
Original file line number Diff line number Diff line change
@@ -15,6 +15,7 @@
# under the License.
import logging

import pytest
import yaml

from mergify_engine import config
@@ -109,6 +110,10 @@ async def test_merge_with_oauth_token(self):
self.assertEqual(True, p["merged"])
self.assertEqual("mergify-test4", p["merged_by"]["login"])

@pytest.mark.skipif(
not config.GITHUB_URL.startswith("https://github.com"),
reason="required_conversation_resolution requires GHES 3.2",
)
async def test_merge_branch_protection_conversation_resolution(self):
rules = {
"pull_request_rules": [

0 comments on commit 3d034e2

Please sign in to comment.