🚨 auto fix by pre-commit hooks

tests/builtin_plugins/check/test_check.py

@@ -64,9 +64,11 @@ def init_mocker(mocker: MockerFixture, tmp_path: Path):
     mock_platform = mocker.patch("zhenxun.builtin_plugins.check.data_source.platform")
     mock_platform.uname.return_value = platform_uname
 
-    mock_template_to_pic = mocker.patch("zhenxun.builtin_plugins.check.template_to_pic")
-    mock_template_to_pic_return = mocker.AsyncMock()
-    mock_template_to_pic.return_value = mock_template_to_pic_return
+    mock_render_service = mocker.patch(
+        "zhenxun.builtin_plugins.check.renderer_service.render"
+    )
+    mock_render_service_return = mocker.AsyncMock()
+    mock_render_service.return_value = mock_render_service_return
 
     mock_build_message = mocker.patch(
         "zhenxun.builtin_plugins.check.MessageUtils.build_message"
@@ -74,19 +76,14 @@ def init_mocker(mocker: MockerFixture, tmp_path: Path):
     mock_build_message_return = mocker.AsyncMock()
     mock_build_message.return_value = mock_build_message_return
 
-    mock_template_path_new = tmp_path / "resources" / "template"
-    mocker.patch(
-        "zhenxun.builtin_plugins.check.TEMPLATE_PATH", new=mock_template_path_new
-    )
     return (
         mock_psutil,
         mock_cpuinfo,
         mock_platform,
-        mock_template_to_pic,
-        mock_template_to_pic_return,
+        mock_render_service,
+        mock_render_service_return,
         mock_build_message,
         mock_build_message_return,
-        mock_template_path_new,
     )
 
 
@@ -105,11 +102,10 @@ async def test_check(
         mock_psutil,
         mock_cpuinfo,
         mock_platform,
-        mock_template_to_pic,
-        mock_template_to_pic_return,
+        mock_render_service,
+        mock_render_service_return,
         mock_build_message,
         mock_build_message_return,
-        mock_template_path_new,
     ) = init_mocker(mocker, tmp_path)
     async with app.test_matcher(_self_check_matcher) as ctx:
         bot = create_bot(ctx)
@@ -126,8 +122,8 @@ async def test_check(
         ctx.receive_event(bot=bot, event=event)
         ctx.should_ignore_rule(_self_check_matcher)
 
-    mock_template_to_pic.assert_awaited_once()
-    mock_build_message.assert_called_once_with(mock_template_to_pic_return)
+    mock_render_service.assert_awaited_once()
+    mock_build_message.assert_called_once_with(mock_render_service_return)
     mock_build_message_return.send.assert_awaited_once()
 
 
@@ -161,11 +157,10 @@ async def test_check_arm(
         mock_psutil,
         mock_cpuinfo,
         mock_platform,
-        mock_template_to_pic,
-        mock_template_to_pic_return,
+        mock_render_service,
+        mock_render_service_return,
         mock_build_message,
         mock_build_message_return,
-        mock_template_path_new,
     ) = init_mocker(mocker, tmp_path)
 
     mock_platform.uname.return_value = platform_uname_arm
@@ -199,6 +194,6 @@ async def test_check_arm(
             mocker.call().decode().split().__getitem__().__float__(),
         ]  # type: ignore
     )
-    mock_template_to_pic.assert_awaited_once()
-    mock_build_message.assert_called_once_with(mock_template_to_pic_return)
+    mock_render_service.assert_awaited_once()
+    mock_build_message.assert_called_once_with(mock_render_service_return)
     mock_build_message_return.send.assert_awaited_once()

tests/builtin_plugins/plugin_store/test_add_plugin.py

@@ -6,7 +6,6 @@ from nonebot.adapters.onebot.v11 import Bot
 from nonebot.adapters.onebot.v11.event import GroupMessageEvent
 from nonebot.adapters.onebot.v11.message import Message
 from nonebug import App
-import pytest
 from pytest_mock import MockerFixture
 
 from tests.config import BotId, GroupId, MessageId, UserId
@@ -15,7 +14,6 @@ from tests.utils import _v11_group_message_event
 test_path = Path(__file__).parent.parent.parent
 
 
-@pytest.mark.skip("修不好")
 async def test_add_plugin_basic(
     app: App,
     mocker: MockerFixture,
@@ -62,7 +60,6 @@ async def test_add_plugin_basic(
     assert (mock_base_path / "plugins" / "search_image" / "__init__.py").is_file()
 
 
-@pytest.mark.skip("修不好")
 async def test_add_plugin_basic_commit_version(
     app: App,
     mocker: MockerFixture,
@@ -109,7 +106,6 @@ async def test_add_plugin_basic_commit_version(
     assert (mock_base_path / "plugins" / "bilibili_sub" / "__init__.py").is_file()
 
 
-@pytest.mark.skip("修不好")
 async def test_add_plugin_basic_is_not_dir(
     app: App,
     mocker: MockerFixture,
@@ -156,7 +152,6 @@ async def test_add_plugin_basic_is_not_dir(
     assert (mock_base_path / "plugins" / "jitang.py").is_file()
 
 
-@pytest.mark.skip("修不好")
 async def test_add_plugin_extra(
     app: App,
     mocker: MockerFixture,
@@ -203,7 +198,6 @@ async def test_add_plugin_extra(
     assert (mock_base_path / "plugins" / "github_sub" / "__init__.py").is_file()
 
 
-@pytest.mark.skip("修不好")
 async def test_plugin_not_exist_add(
     app: App,
     create_bot: Callable,
@@ -242,7 +236,6 @@ async def test_plugin_not_exist_add(
         )
 
 
-@pytest.mark.skip("修不好")
 async def test_add_plugin_exist(
     app: App,
     mocker: MockerFixture,

tests/builtin_plugins/plugin_store/test_remove_plugin.py

@@ -8,14 +8,12 @@ from nonebot.adapters.onebot.v11 import Bot
 from nonebot.adapters.onebot.v11.event import GroupMessageEvent
 from nonebot.adapters.onebot.v11.message import Message
 from nonebug import App
-import pytest
 from pytest_mock import MockerFixture
 
 from tests.config import BotId, GroupId, MessageId, UserId
 from tests.utils import _v11_group_message_event
 
 
-@pytest.mark.skip("修不好")
 async def test_remove_plugin(
     app: App,
     mocker: MockerFixture,
@@ -62,7 +60,6 @@ async def test_remove_plugin(
     assert not (mock_base_path / "plugins" / "search_image" / "__init__.py").is_file()
 
 
-@pytest.mark.skip("修不好")
 async def test_plugin_not_exist_remove(
     app: App,
     create_bot: Callable,
@@ -95,7 +92,6 @@ async def test_plugin_not_exist_remove(
         )
 
 
-@pytest.mark.skip("修不好")
 async def test_remove_plugin_not_install(
     app: App,
     mocker: MockerFixture,

tests/builtin_plugins/plugin_store/test_search_plugin.py

@@ -5,14 +5,12 @@ from nonebot.adapters.onebot.v11 import Bot
 from nonebot.adapters.onebot.v11.event import GroupMessageEvent
 from nonebot.adapters.onebot.v11.message import Message
 from nonebug import App
-import pytest
 from pytest_mock import MockerFixture
 
 from tests.config import BotId, GroupId, MessageId, UserId
 from tests.utils import _v11_group_message_event
 
 
-@pytest.mark.skip("修不好")
 async def test_search_plugin_name(
     app: App,
     mocker: MockerFixture,
@@ -54,7 +52,6 @@ async def test_search_plugin_name(
     mock_build_message_return.send.assert_awaited_once()
 
 
-@pytest.mark.skip("修不好")
 async def test_search_plugin_author(
     app: App,
     mocker: MockerFixture,
@@ -96,7 +93,6 @@ async def test_search_plugin_author(
     mock_build_message_return.send.assert_awaited_once()
 
 
-@pytest.mark.skip("修不好")
 async def test_plugin_not_exist_search(
     app: App,
     create_bot: Callable,

tests/builtin_plugins/plugin_store/test_update_all_plugin.py

@@ -6,14 +6,12 @@ from nonebot.adapters.onebot.v11 import Bot
 from nonebot.adapters.onebot.v11.event import GroupMessageEvent
 from nonebot.adapters.onebot.v11.message import Message
 from nonebug import App
-import pytest
 from pytest_mock import MockerFixture
 
 from tests.config import BotId, GroupId, MessageId, UserId
 from tests.utils import _v11_group_message_event
 
 
-@pytest.mark.skip("修不好")
 async def test_update_all_plugin_basic_need_update(
     app: App,
     mocker: MockerFixture,
@@ -64,7 +62,6 @@ async def test_update_all_plugin_basic_need_update(
     assert (mock_base_path / "plugins" / "search_image" / "__init__.py").is_file()
 
 
-@pytest.mark.skip("修不好")
 async def test_update_all_plugin_basic_is_new(
     app: App,
     mocker: MockerFixture,

tests/builtin_plugins/plugin_store/test_update_plugin.py

@@ -6,14 +6,13 @@ from nonebot.adapters.onebot.v11 import Bot
 from nonebot.adapters.onebot.v11.event import GroupMessageEvent
 from nonebot.adapters.onebot.v11.message import Message
 from nonebug import App
-import pytest
 from pytest_mock import MockerFixture
+from respx import MockRouter
 
 from tests.config import BotId, GroupId, MessageId, UserId
 from tests.utils import _v11_group_message_event
 
 
-@pytest.mark.skip("修不好")
 async def test_update_plugin_basic_need_update(
     app: App,
     mocker: MockerFixture,
@@ -64,7 +63,6 @@ async def test_update_plugin_basic_need_update(
     assert (mock_base_path / "plugins" / "search_image" / "__init__.py").is_file()
 
 
-@pytest.mark.skip("修不好")
 async def test_update_plugin_basic_is_new(
     app: App,
     mocker: MockerFixture,
@@ -114,7 +112,6 @@ async def test_update_plugin_basic_is_new(
         )
 
 
-@pytest.mark.skip("修不好")
 async def test_plugin_not_exist_update(
     app: App,
     create_bot: Callable,
@@ -153,9 +150,9 @@ async def test_plugin_not_exist_update(
         )
 
 
-@pytest.mark.skip("修不好")
 async def test_update_plugin_not_install(
     app: App,
+    mocked_api: MockRouter,
     create_bot: Callable,
 ) -> None:
     """

zhenxun/services/renderer/service.py

@@ -379,7 +379,7 @@ class RendererService:
                         data_str = json.dumps(data or {}, sort_keys=True)
                     cache_key_str = f"{template_name}:{data_str}"
                     cache_filename = (
-                        f"{hashlib.md5(cache_key_str.encode()).hexdigest()}.png"
+                        f"{hashlib.sha256(cache_key_str.encode()).hexdigest()}.png"
                     )
                     cache_path = UI_CACHE_PATH / cache_filename