should already be printing on error

Spitfire1900 · Jan 1, 2025 · bcc2a49 · bcc2a49
1 parent e278247
commit bcc2a49
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -28,4 +28,4 @@ jobs:
       - name: Run tests
         run: |
           xonsh -c "xontrib load pygitstatus"
-          bash -c "set -o pipefail && pytest --collect-only --quiet | grep --invert-match 'tests collected' | xargs --replace='%0' --max-procs=1 --max-args=1 sh -c 'pytest --capture=no %0 || exit 255'"
+          bash -c "set -o pipefail && pytest --collect-only --quiet | grep --invert-match 'tests collected' | xargs --replace='%0' --max-procs=1 --max-args=1 sh -c 'pytest %0 || exit 255'"
diff --git a/tests/test_xontrib.py b/tests/test_xontrib.py
@@ -159,6 +159,7 @@ def test_conflict(tmp_path):
     # Should error since there is a conflict
     with contextlib.suppress(GitCommandError):
         git_repo.git.merge('f1')
+    print('Printing git status')
     print(git_repo.git.status())
     assert PromptFormatter()('{pygitstatus.conflicts}') == '{RED}×1{RESET}'