fix(tests): dont specify mocks

tests/test_handlers.py

@@ -9,13 +9,9 @@ import tarfile
 import typing
 import unittest.mock
 
-from src.cert_manager import CertManager
-from src.data_dir import DataDir
 from src.handlers import BaseHandler, RequestHandler, UpgradeHandler
 from src.page import Page
 from src.params import Parameters
-from src.registry import Registry
-from src.token_manager import TokenManager
 
 from . import BaseTestCase
 
@@ -122,11 +118,11 @@ class TestRequestHandler(BaseHandlerTestCase):
     @typing.override
     def setUp(self) -> None:
         self.get_tmp_dir()
-        self.registry = self.mock(Registry)
-        self.cert_manager = self.mock(CertManager)
-        self.token_manager = self.mock(TokenManager)
+        self.registry = self.new_mock()
+        self.cert_manager = self.new_mock()
+        self.token_manager = self.new_mock()
         self.certbot_www = self.tmp_path / "certbot_www"
-        self.data_dir = self.mock(DataDir)
+        self.data_dir = self.new_mock()
         super().setUp()
 
     def _get_handler(

tests/test_registry.py

@@ -3,7 +3,6 @@ import typing
 import unittest
 import unittest.mock
 
-from src.data_dir import DataDir
 from src.page import Page
 from src.params import Parameters
 from src.registry import Registry
@@ -16,7 +15,7 @@ class TestRegistry(BaseTestCase):
     def setUp(self) -> None:
         self.registry = Registry(Parameters())
         self.registry.logger = unittest.mock.Mock(logging.Logger)
-        self.data_dir = self.registry.data_dir = self.mock(DataDir)
+        self.data_dir = self.registry.data_dir = self.new_mock()
         super().setUp()
 
     def test_load_pages(self) -> None:

tests/test_server.py

@@ -4,12 +4,8 @@ import typing
 import unittest
 import unittest.mock
 
-from src.cert_manager import CertManager
-from src.data_dir import DataDir
 from src.params import Parameters
-from src.registry import Registry
 from src.server import StaplerServer
-from src.token_manager import TokenManager
 
 from . import BaseTestCase
 
@@ -19,10 +15,10 @@ class TestStaplerServer(BaseTestCase):
     def setUp(self) -> None:
         self.server = StaplerServer(Parameters())
         self.server.logger = unittest.mock.Mock(logging.Logger)
-        self.registry = self.server.registry = self.mock(Registry)
-        self.cert_manager = self.server.cert_manager = self.mock(CertManager)
-        self.token_manager = self.server.token_manager = self.mock(TokenManager)
-        self.data_dir = self.server.data_dir = self.mock(DataDir)
+        self.registry = self.server.registry = self.new_mock()
+        self.cert_manager = self.server.cert_manager = self.new_mock()
+        self.token_manager = self.server.token_manager = self.new_mock()
+        self.data_dir = self.server.data_dir = self.new_mock()
         self.server_mock = unittest.mock.MagicMock()
         self.context_mock = unittest.mock.Mock(ssl.SSLContext)
         super().setUp()

tests/test_token_manager.py

@@ -5,7 +5,6 @@ import unittest.mock
 
 from src.page import Page
 from src.params import Parameters
-from src.registry import Registry
 from src.token_manager import TokenManager
 
 from . import BaseTestCase
@@ -18,7 +17,7 @@ class TestTokenManager(BaseTestCase):
 
     @typing.override
     def setUp(self) -> None:
-        self.registry = self.mock(Registry)
+        self.registry = self.new_mock()
         self.token_manager = TokenManager(
             Parameters(data_dir=self.get_tmp_dir(), token_salt="salt"),  # noqa: S106
             self.registry,