From aa843746a4c4fc92aeabf7bf9c6822a7886c4c6c Mon Sep 17 00:00:00 2001 From: Christine Mecklenborg Date: Fri, 30 Oct 2020 15:12:40 -0500 Subject: [PATCH] Migrate test_error_diffs.py from testdir to pytester (#7971) --- testing/test_error_diffs.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/testing/test_error_diffs.py b/testing/test_error_diffs.py index 2857df832..1668e929a 100644 --- a/testing/test_error_diffs.py +++ b/testing/test_error_diffs.py @@ -7,6 +7,7 @@ See https://github.com/pytest-dev/pytest/issues/3333 for details. import sys import pytest +from _pytest.pytester import Pytester TESTCASES = [ @@ -274,9 +275,9 @@ if sys.version_info[:2] >= (3, 7): @pytest.mark.parametrize("code, expected", TESTCASES) -def test_error_diff(code, expected, testdir): - expected = [line.lstrip() for line in expected.splitlines()] - p = testdir.makepyfile(code) - result = testdir.runpytest(p, "-vv") - result.stdout.fnmatch_lines(expected) +def test_error_diff(code: str, expected: str, pytester: Pytester) -> None: + expected_lines = [line.lstrip() for line in expected.splitlines()] + p = pytester.makepyfile(code) + result = pytester.runpytest(p, "-vv") + result.stdout.fnmatch_lines(expected_lines) assert result.ret == 1