Skip to content

Commit

Permalink
always show full diff in ci
Browse files Browse the repository at this point in the history
follow-up to #1314, for similar reasons

closes #9023
  • Loading branch information
davidszotten committed Aug 19, 2021
1 parent 2367e6e commit d5c020d
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 1 deletion.
4 changes: 4 additions & 0 deletions changelog/9023.feature.rst
@@ -0,0 +1,4 @@

Full diffs are now always shown for equality assertions of iterables when
`CI` or ``BUILD_NUMBER`` is found in the environment, even when ``-v`` isn't
used.
2 changes: 1 addition & 1 deletion src/_pytest/assertion/util.py
Expand Up @@ -287,7 +287,7 @@ def _surrounding_parens_on_own_lines(lines: List[str]) -> None:
def _compare_eq_iterable(
left: Iterable[Any], right: Iterable[Any], verbose: int = 0
) -> List[str]:
if not verbose:
if not verbose and not running_on_ci():
return ["Use -v to get the full diff"]
# dynamic import to speedup pytest
import difflib
Expand Down
20 changes: 20 additions & 0 deletions testing/test_assertion.py
Expand Up @@ -13,6 +13,7 @@
from _pytest import outcomes
from _pytest.assertion import truncate
from _pytest.assertion import util
from _pytest.monkeypatch import MonkeyPatch
from _pytest.pytester import Pytester


Expand Down Expand Up @@ -448,6 +449,25 @@ def test_iterable_full_diff(self, left, right, expected) -> None:
assert verbose_expl is not None
assert "\n".join(verbose_expl).endswith(textwrap.dedent(expected).strip())

def test_iterable_full_diff_ci(
self, monkeypatch: MonkeyPatch, pytester: Pytester
) -> None:
pytester.makepyfile(
r"""
def test_full_diff():
left = [0, 1]
right = [0, 2]
assert left == right
"""
)
monkeypatch.setenv("CI", "true")
result = pytester.runpytest()
result.stdout.fnmatch_lines(["E Full diff:"])

monkeypatch.delenv("CI", raising=False)
result = pytester.runpytest()
result.stdout.fnmatch_lines(["E Use -v to get the full diff"])

def test_list_different_lengths(self) -> None:
expl = callequal([0, 1], [0, 1, 2])
assert expl is not None
Expand Down

0 comments on commit d5c020d

Please sign in to comment.