Skip to content
Draft
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
10 changes: 6 additions & 4 deletions pytest_mergify/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,15 +71,17 @@ def pytest_terminal_summary(
yellow=True,
)

# CI Insights Quarantine warning logs
# Mergify Test Insights Quarantine warning logs
if not self.mergify_ci.branch_name:
terminalreporter.write_line(
"No valid branch name found, unable to setup CI Insights Quarantine",
"No valid branch name found, unable to set up Mergify Test Insights Quarantine",
yellow=True,
)

if self.mergify_ci.quarantined_tests is None:
terminalreporter.write_line("CI Insights Quarantine could not be setup")
terminalreporter.write_line(
"Mergify Test Insights Quarantine could not be set up"
)
elif self.mergify_ci.quarantined_tests is not None:
if self.mergify_ci.quarantined_tests.init_error_msg:
terminalreporter.write_line(
Expand All @@ -90,7 +92,7 @@ def pytest_terminal_summary(
self.mergify_ci.quarantined_tests.quarantined_tests_report()
)

# CI Insights Traces upload logs
# Mergify Test Insights Traces upload logs
if self.mergify_ci.tracer_provider is None:
terminalreporter.write_line(
"Mergify Tracer didn't start for unexpected reason (please contact Mergify support); test results will not be uploaded",
Expand Down
6 changes: 3 additions & 3 deletions pytest_mergify/quarantine.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ def __post_init__(self) -> None:
try:
owner, repository = self.repo_name.split("/")
except ValueError:
self.init_error_msg = f"Repository name '{self.repo_name}' has an unexpected format (expected 'owner/repository'), skipping CI Insights Quarantine setup"
self.init_error_msg = f"Repository name '{self.repo_name}' has an unexpected format (expected 'owner/repository'), skipping Mergify Test Insights Quarantine initialization"
return

url = f"{self.api_url}/v1/ci/{owner}/repositories/{repository}/quarantines"
Expand All @@ -41,7 +41,7 @@ def __post_init__(self) -> None:
return

if quarantine_resp.status_code == 402:
# No CI Insights Quarantine subscription, skip it.
# No Mergify Test Insights Quarantine subscription, skip it.
return

try:
Expand Down Expand Up @@ -84,7 +84,7 @@ def quarantined_tests_report(self) -> str:
def mark_test_as_quarantined(self, test_item: _pytest.nodes.Item) -> None:
test_item.add_marker(
pytest.mark.xfail(
reason="Test is quarantined from Mergify CI Insights",
reason="Test is quarantined from Mergify Test Insights",
raises=None,
run=True,
strict=False,
Expand Down
Loading