testing: improve mocking in terminalprogress tests

Author: bluetech

testing/test_terminal.py

@@ -12,8 +12,7 @@
 from typing import cast
 from typing import Literal
 from typing import NamedTuple
-from unittest.mock import Mock
-from unittest.mock import patch
+from unittest import mock
 
 import pluggy
 
@@ -3419,45 +3418,47 @@ def mock_file(self) -> StringIO:
 
     @pytest.fixture
     def mock_tr(self, mock_file: StringIO) -> pytest.TerminalReporter:
-        tr = Mock(spec=pytest.TerminalReporter)
+        tr: pytest.TerminalReporter = mock.create_autospec(pytest.TerminalReporter)
 
-        def write_raw(s: str, *, flush: bool = False) -> None:
-            mock_file.write(s)
+        def write_raw(content: str, *, flush: bool = False) -> None:
+            mock_file.write(content)
 
-        tr.write_raw = write_raw
+        tr.write_raw = write_raw  # type: ignore[method-assign]
         tr._progress_nodeids_reported = set()
         return tr
 
     @pytest.mark.skipif(sys.platform != "win32", reason="#13896")
     def test_plugin_registration_enabled_by_default(
-        self, pytester: pytest.Pytester
+        self, pytester: pytest.Pytester, monkeypatch: MonkeyPatch
     ) -> None:
         """Test that the plugin registration is enabled by default.
 
         Currently only on Windows (#13896).
         """
+        monkeypatch.setattr(sys.stdout, "isatty", lambda: True)
         # The plugin module should be registered as a default plugin.
-        with patch.object(sys.stdout, "isatty", return_value=True):
-            config = pytester.parseconfigure()
-            plugin = config.pluginmanager.get_plugin("terminalprogress")
-            assert plugin is not None
+        config = pytester.parseconfigure()
+        plugin = config.pluginmanager.get_plugin("terminalprogress")
+        assert plugin is not None
 
     def test_plugin_registred_on_all_platforms_when_explicitly_requested(
-        self, pytester: pytest.Pytester
+        self, pytester: pytest.Pytester, monkeypatch: MonkeyPatch
     ) -> None:
         """Test that the plugin is registered on any platform if explicitly requested."""
+        monkeypatch.setattr(sys.stdout, "isatty", lambda: True)
         # The plugin module should be registered as a default plugin.
-        with patch.object(sys.stdout, "isatty", return_value=True):
-            config = pytester.parseconfigure("-p", "terminalprogress")
-            plugin = config.pluginmanager.get_plugin("terminalprogress")
-            assert plugin is not None
+        config = pytester.parseconfigure("-p", "terminalprogress")
+        plugin = config.pluginmanager.get_plugin("terminalprogress")
+        assert plugin is not None
 
-    def test_disabled_for_non_tty(self, pytester: pytest.Pytester) -> None:
+    def test_disabled_for_non_tty(
+        self, pytester: pytest.Pytester, monkeypatch: MonkeyPatch
+    ) -> None:
         """Test that plugin is disabled for non-TTY output."""
-        with patch.object(sys.stdout, "isatty", return_value=False):
-            config = pytester.parseconfigure("-p", "terminalprogress")
-            plugin = config.pluginmanager.get_plugin("terminalprogress-plugin")
-            assert plugin is None
+        monkeypatch.setattr(sys.stdout, "isatty", lambda: False)
+        config = pytester.parseconfigure("-p", "terminalprogress")
+        plugin = config.pluginmanager.get_plugin("terminalprogress-plugin")
+        assert plugin is None
 
     @pytest.mark.parametrize(
         ["state", "progress", "expected"],
@@ -3489,7 +3490,7 @@ def test_session_lifecycle(
         """Test progress updates during session lifecycle."""
         plugin = TerminalProgressPlugin(mock_tr)
 
-        session = Mock(spec=pytest.Session)
+        session = mock.create_autospec(pytest.Session)
         session.testscollected = 3
 
         # Session start - should emit indeterminate progress.