shorter diffs too

Author: hjwp

pytest_icdiff.py

@@ -21,10 +21,10 @@ def pytest_assertrepr_compare(config, op, left, right):
     if len(wide_left) < 3 or len(wide_right) < 3:
         shortest_left = pformat(left, indent=2, width=1).splitlines()
         shortest_right = pformat(right, indent=2, width=1).splitlines()
-        cols = max(len(l) for l in shortest_left + shortest_right) * 2
+        longest_line_length = max(len(l) for l in shortest_left + shortest_right)
     else:
         longest_line_length = max(len(l) for l in wide_left + wide_right)
-        cols = int(min(longest_line_length, cols / 2))
+    cols = int(min(longest_line_length, cols))
 
     pretty_left = pformat(left, indent=2, width=cols / 2).splitlines()
     pretty_right = pformat(right, indent=2, width=cols / 2).splitlines()

tests/test_pytest_icdiff.py

@@ -190,7 +190,7 @@ def test_a():
     assert drilldown_expression in output
 
 
-def test_long_lines_in_comparators_are_wrapped_sensibly(testdir):
+def test_long_lines_in_comparators_are_wrapped_sensibly_multiline(testdir):
     left = {1: "hello " * 20}
     right = {1: "hella " * 20}
     testdir.makepyfile(
@@ -201,4 +201,21 @@ def test_one():
     )
     output = testdir.runpytest('-vv', '--color=yes').stdout.str()
     comparison_line = next(l for l in output.splitlines() if '1:' in l and "assert" not in l)
-    assert len(comparison_line) < 120
+    assert comparison_line.count('hell') < 13
+
+def test_long_lines_in_comparators_are_wrapped_sensibly_singleline(testdir):
+    left = "hello " * 10
+    right = "hella " * 10
+    testdir.makepyfile(
+        f"""
+        def test_one():
+            assert {left!r} == {right!r}
+        """
+    )
+    output = testdir.runpytest('-vv', '--color=yes').stdout.str()
+    comparison_line = next(
+        l for l in output.splitlines()
+        if "hell" in l
+        and "assert" not in l
+    )
+    assert comparison_line.count('hell') < 13