Merge master into features

testing/logging/test_reporting.py

@@ -946,7 +946,7 @@ def test_collection_collect_only_live_logging(testdir, verbose):
         expected_lines.extend(
             [
                 "*test_collection_collect_only_live_logging.py::test_simple*",
-                "no tests ran in 0.[0-9][0-9]s",
+                "no tests ran in [0-1].[0-9][0-9]s",
             ]
         )
     elif verbose == "-qq":

testing/test_capture.py

@@ -7,6 +7,8 @@ import sys
 import textwrap
 from io import StringIO
 from io import UnsupportedOperation
+from typing import BinaryIO
+from typing import Generator
 from typing import List
 from typing import TextIO
 
@@ -854,7 +856,7 @@ def test_dontreadfrominput():
 
 
 @pytest.fixture
-def tmpfile(testdir):
+def tmpfile(testdir) -> Generator[BinaryIO, None, None]:
     f = testdir.makepyfile("").open("wb+")
     yield f
     if not f.closed:
@@ -1537,3 +1539,15 @@ def test_typeerror_encodedfile_write(testdir):
 def test_stderr_write_returns_len(capsys):
     """Write on Encoded files, namely captured stderr, should return number of characters written."""
     assert sys.stderr.write("Foo") == 3
+
+
+def test_encodedfile_writelines(tmpfile: BinaryIO) -> None:
+    ef = capture.EncodedFile(tmpfile, "utf-8")
+    with pytest.raises(AttributeError):
+        ef.writelines([b"line1", b"line2"])  # type: ignore[list-item]  # noqa: F821
+    assert ef.writelines(["line1", "line2"]) is None  # type: ignore[func-returns-value]  # noqa: F821
+    tmpfile.seek(0)
+    assert tmpfile.read() == b"line1line2"
+    tmpfile.close()
+    with pytest.raises(ValueError):
+        ef.read()

testing/test_collection.py

@@ -9,6 +9,7 @@ import pytest
 from _pytest.main import _in_venv
 from _pytest.main import ExitCode
 from _pytest.main import Session
+from _pytest.pytester import Testdir
 
 
 class TestCollector:
@@ -18,7 +19,7 @@ class TestCollector:
         assert not issubclass(Collector, Item)
         assert not issubclass(Item, Collector)
 
-    def test_check_equality(self, testdir):
+    def test_check_equality(self, testdir: Testdir) -> None:
         modcol = testdir.getmodulecol(
             """
             def test_pass(): pass
@@ -40,12 +41,15 @@ class TestCollector:
         assert fn1 != fn3
 
         for fn in fn1, fn2, fn3:
-            assert fn != 3
+            assert isinstance(fn, pytest.Function)
+            assert fn != 3  # type: ignore[comparison-overlap]  # noqa: F821
             assert fn != modcol
-            assert fn != [1, 2, 3]
-            assert [1, 2, 3] != fn
+            assert fn != [1, 2, 3]  # type: ignore[comparison-overlap]  # noqa: F821
+            assert [1, 2, 3] != fn  # type: ignore[comparison-overlap]  # noqa: F821
             assert modcol != fn
 
+        assert testdir.collect_by_name(modcol, "doesnotexist") is None
+
     def test_getparent(self, testdir):
         modcol = testdir.getmodulecol(
             """

testing/test_config.py

@@ -670,6 +670,32 @@ def test_disable_plugin_autoload(testdir, monkeypatch, parse_args, should_load):
     assert has_loaded == should_load
 
 
+def test_plugin_loading_order(testdir):
+    """Test order of plugin loading with `-p`."""
+    p1 = testdir.makepyfile(
+        """
+        def test_terminal_plugin(request):
+            import myplugin
+            assert myplugin.terminal_plugin == [True, True]
+        """,
+        **{
+            "myplugin": """
+            terminal_plugin = []
+
+            def pytest_configure(config):
+                terminal_plugin.append(bool(config.pluginmanager.get_plugin("terminalreporter")))
+
+            def pytest_sessionstart(session):
+                config = session.config
+                terminal_plugin.append(bool(config.pluginmanager.get_plugin("terminalreporter")))
+            """
+        }
+    )
+    testdir.syspathinsert()
+    result = testdir.runpytest("-p", "myplugin", str(p1))
+    assert result.ret == 0
+
+
 def test_cmdline_processargs_simple(testdir):
     testdir.makeconftest(
         """

testing/test_terminal.py

@@ -13,6 +13,7 @@ import py
 
 import pytest
 from _pytest.main import ExitCode
+from _pytest.pytester import Testdir
 from _pytest.reports import BaseReport
 from _pytest.terminal import _folded_skips
 from _pytest.terminal import _get_line_with_reprcrash_message
@@ -1978,3 +1979,11 @@ def test_collecterror(testdir):
             "*= 1 error in *",
         ]
     )
+
+
+def test_via_exec(testdir: Testdir) -> None:
+    p1 = testdir.makepyfile("exec('def test_via_exec(): pass')")
+    result = testdir.runpytest(str(p1), "-vv")
+    result.stdout.fnmatch_lines(
+        ["test_via_exec.py::test_via_exec <- <string> PASSED*", "*= 1 passed in *"]
+    )