Fix test errors in plugin manager

Author: linuxdaemon

tests/conftest.py

@@ -1,4 +1,5 @@
 import datetime
+import importlib
 import logging
 from typing import List
 from unittest.mock import MagicMock, patch
@@ -30,13 +31,13 @@ def caplog_bot(caplog):
 
 @pytest.fixture()
 def patch_import_module():
-    with patch("importlib.import_module") as mocked:
+    with patch.object(importlib, "import_module") as mocked:
         yield mocked
 
 
 @pytest.fixture()
 def patch_import_reload():
-    with patch("importlib.reload") as mocked:
+    with patch.object(importlib, "reload") as mocked:
         yield mocked
 
 

tests/core_tests/test_plugin_manager.py

@@ -14,7 +14,6 @@
 from cloudbot.util import database
 from tests.util.mock_module import MockModule
 
-
 @pytest.fixture()
 def mock_bot(mock_bot_factory, event_loop, tmp_path):
     tmp_base = tmp_path / "tmp"
@@ -138,8 +137,6 @@ def test_can_load(mock_manager):
 
 
 def test_plugin_load(mock_manager, patch_import_module, patch_import_reload):
-    patch_import_module.reset_mock()
-    patch_import_reload.reset_mock()
     patch_import_module.return_value = mod = MockModule()
     mock_manager.bot.loop.run_until_complete(
         mock_manager.load_plugin(mock_manager.bot.plugin_dir / "test.py")
@@ -223,6 +220,8 @@ def test_plugin_with_objs_full_dict_attr(mock_manager, patch_import_module):
 def test_plugin_load_disabled(
     mock_manager, patch_import_module, patch_import_reload
 ):
+    patch_import_module.reset_mock()
+    patch_import_reload.reset_mock()
     patch_import_module.return_value = MockModule()
     mock_manager.bot.config.update(
         {