Update tests and testoptions for PyPy

pylint/testutils/checker_test_case.py

@@ -11,7 +11,7 @@
 
 from astroid import nodes
 
-from pylint.constants import PY38_PLUS
+from pylint.constants import IS_PYPY, PY38_PLUS, PY39_PLUS
 from pylint.testutils.global_test_linter import linter
 from pylint.testutils.output_line import MessageTest
 from pylint.testutils.unittest_linter import UnittestLinter
@@ -77,7 +77,7 @@ def assertAddsMessages(
 
             assert expected_msg.line == gotten_msg.line, msg
             assert expected_msg.col_offset == gotten_msg.col_offset, msg
-            if PY38_PLUS:
+            if PY38_PLUS and not IS_PYPY or PY39_PLUS:
                 # TODO: 3.0: Remove deprecated missing arguments and remove the warning
                 if not expected_msg.end_line == gotten_msg.end_line:
                     warnings.warn(  # pragma: no cover

pylint/testutils/lint_module_test.py

@@ -19,6 +19,7 @@
 
 from pylint import checkers
 from pylint.config.config_initialization import _config_initialization
+from pylint.constants import IS_PYPY
 from pylint.lint import PyLinter
 from pylint.message.message import Message
 from pylint.testutils.constants import _EXPECTED_RE, _OPERATORS, UPDATE_OPTION
@@ -60,6 +61,9 @@ def __init__(
         self._check_end_position = (
             sys.version_info >= self._test_file.options["min_pyver_end_position"]
         )
+        # TODO: PY3.9: PyPy supports end_lineno from 3.9 and above
+        if self._check_end_position and IS_PYPY:
+            self._check_end_position = sys.version_info >= (3, 9)  # pragma: no cover
         try:
             args = [test_file.source]
         except NoFileError:

tests/functional/c/consider/consider_using_with_open.py

@@ -1,10 +1,8 @@
 # pylint: disable=missing-function-docstring, missing-module-docstring, invalid-name, import-outside-toplevel, no-self-use
 # pylint: disable=missing-class-docstring, too-few-public-methods, unused-variable, multiple-statements, line-too-long
 """
-The functional test for the standard ``open()`` function has to be moved in a separate file,
-because PyPy has to be excluded for the tests as the ``open()`` function is uninferable in PyPy.
-However, all remaining checks for consider-using-with work in PyPy, so we do not want to exclude
-PyPy from ALL functional tests.
+Previously, open was uninferable on PyPy so we moved all functional tests
+to a separate file. This is no longer the case but the files remain split.
 """
 from contextlib import contextmanager
 from pathlib import Path

tests/functional/c/consider/consider_using_with_open.txt

@@ -1,7 +1,7 @@
-consider-using-with:12:9:12:43::Consider using 'with' for resource-allocating operations:UNDEFINED
-consider-using-with:16:9:16:43:test_open:Consider using 'with' for resource-allocating operations:UNDEFINED
-consider-using-with:46:4:46:33:test_open_outside_assignment:Consider using 'with' for resource-allocating operations:UNDEFINED
-consider-using-with:47:14:47:43:test_open_outside_assignment:Consider using 'with' for resource-allocating operations:UNDEFINED
-consider-using-with:52:8:52:37:test_open_inside_with_block:Consider using 'with' for resource-allocating operations:UNDEFINED
-consider-using-with:120:26:122:13:TestControlFlow.test_triggers_if_reassigned_after_if_else:Consider using 'with' for resource-allocating operations:UNDEFINED
-used-before-assignment:141:12:141:23:TestControlFlow.test_defined_in_try_and_finally:Using variable 'file_handle' before assignment:CONTROL_FLOW
+consider-using-with:10:9:10:43::Consider using 'with' for resource-allocating operations:UNDEFINED
+consider-using-with:14:9:14:43:test_open:Consider using 'with' for resource-allocating operations:UNDEFINED
+consider-using-with:44:4:44:33:test_open_outside_assignment:Consider using 'with' for resource-allocating operations:UNDEFINED
+consider-using-with:45:14:45:43:test_open_outside_assignment:Consider using 'with' for resource-allocating operations:UNDEFINED
+consider-using-with:50:8:50:37:test_open_inside_with_block:Consider using 'with' for resource-allocating operations:UNDEFINED
+consider-using-with:118:26:120:13:TestControlFlow.test_triggers_if_reassigned_after_if_else:Consider using 'with' for resource-allocating operations:UNDEFINED
+used-before-assignment:139:12:139:23:TestControlFlow.test_defined_in_try_and_finally:Using variable 'file_handle' before assignment:CONTROL_FLOW

tests/functional/i/import_error.rc

@@ -6,4 +6,5 @@ enable=multiple-imports
 ignored-modules=external_module,fake_module.submodule,foo,bar
 
 [testoptions]
+# TODO: PY3.9: This does pass on PyPy 3.9
 except_implementations=PyPy

tests/functional/u/undefined/undefined_variable_typing.rc

@@ -1,4 +1,6 @@
 [testoptions]
-except_implementations=PyPy
+# This was added as PyPy is only able to run this on 3.8 and above
+min_pyver=3.8
+
 [VARIABLES]
 additional-builtins=__additional_builtin__

tests/functional/u/unused/unused_typing_imports.rc

@@ -1,2 +1,3 @@
 [testoptions]
-except_implementations=PyPy
+# This was added as PyPy is only able to run this on 3.8 and above
+min_pyver=3.8