Skip to content

Commit

Permalink
additional debug info when tests are failing
Browse files Browse the repository at this point in the history
  • Loading branch information
defreng committed Sep 17, 2023
1 parent 1e73385 commit 2c3c114
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
7 changes: 6 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
# foxops 🦊

![ci build](https://github.com/Roche/foxops/actions/workflows/ci.yml/badge.svg)
![License](https://img.shields.io/github/license/Roche/foxops)
![Python Version](https://img.shields.io/pypi/pyversions/foxops)

![build status](https://img.shields.io/github/actions/workflow/status/Roche/foxops/ci.yml)
![deployment status](https://img.shields.io/github/actions/workflow/status/Roche/foxops/cd.yml?label=deployment)


Foxops is a tool that helps to create Git repositories from a template file structure. It serves as a central tool for maintaining an overview of all repositories created from a template, including their versions and the data used to fill placeholders.

Expand Down
3 changes: 2 additions & 1 deletion tests/e2e/assertions.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,12 +81,13 @@ def assert_update_merge_request_with_conflicts_exists(
# Assert that there is a rejection file in the Merge Request changes
response = gitlab_client.get(f"/projects/{quote_plus(repository)}/merge_requests/{merge_request['iid']}/changes")
response.raise_for_status()

changes = response.json()["changes"]

for f in files_with_conflicts:
assert any(
c["new_path"] == f"{f}.rej" and c["new_file"] for c in changes
), f"No rejection file found for file {f}"
), f"No rejection file found for file {f}. Changes: {changes}. Merge request: {merge_request}"

assert all(f"- {f}" in merge_request["description"] for f in files_with_conflicts)

Expand Down

0 comments on commit 2c3c114

Please sign in to comment.