Skip to content

Commit ca8de6a

Browse files
committed
ok alternative fix
1 parent b46f4e3 commit ca8de6a

File tree

1 file changed

+1
-10
lines changed

1 file changed

+1
-10
lines changed

tests/test_pytest_icdiff.py

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,6 @@
99
GREEN_ON = '\x1b[1;32m'
1010
ANSI_ESCAPE_RE = re.compile(r'(\x9B|\x1B\[)[0-?]*[ -/]*[@-~]')
1111

12-
@pytest.fixture
13-
def with_80_col_terminal():
14-
# haven't found a better way to simulate terminal sizes
15-
# at a lower level yet sadly.
16-
with mock.patch("pytest_icdiff.COLS", 99):
17-
yield
1812

1913

2014
def test_short_dict(testdir):
@@ -202,7 +196,6 @@ def test_a():
202196
assert drilldown_expression in output
203197

204198

205-
@pytest.mark.usefixtures("with_80_col_terminal")
206199
def test_long_lines_in_comparators_are_wrapped_sensibly_multiline(testdir):
207200
left = {1: "hello " * 20, 2: 'two'}
208201
right = {1: "hella " * 20, 2: 'two'}
@@ -217,7 +210,6 @@ def test_one():
217210
assert comparison_line.count('hell') < 13
218211

219212

220-
@pytest.mark.usefixtures("with_80_col_terminal")
221213
def test_long_lines_in_comparators_are_wrapped_sensibly_singleline(testdir):
222214
left = "hello " * 10
223215
right = "hella " * 10
@@ -288,7 +280,6 @@ def test_one():
288280
assert f"123456 123456{GREEN_ON}7" in output
289281

290282

291-
@pytest.mark.usefixtures("with_80_col_terminal")
292283
def test_really_long_diffs_use_context_mode(testdir):
293284
testdir.makepyfile(
294285
f"""
@@ -298,6 +289,6 @@ def test_one():
298289
assert one == two
299290
"""
300291
)
301-
output = testdir.runpytest('-vv', '--color=yes').stdout.str()
292+
output = testdir.runpytest('-vv', '--color=yes', '-r=no').stdout.str()
302293
assert len(output.splitlines()) < 50
303294
assert "---" in output # context split marker

0 commit comments

Comments
 (0)