From f5017b5631d7b24e281464e85c1dd99b80827cfb Mon Sep 17 00:00:00 2001 From: Anton Skrypnyk Date: Wed, 24 Jul 2024 17:15:46 +0300 Subject: [PATCH] Fix unittest mocks. --- octoprint_bambu_printer/bambu_print_plugin.py | 2 -- .../printer/states/paused_state.py | 1 + test/test_gcode_execution.py | 19 ++++++++++++++++--- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/octoprint_bambu_printer/bambu_print_plugin.py b/octoprint_bambu_printer/bambu_print_plugin.py index 48d95d3..bd8e45e 100644 --- a/octoprint_bambu_printer/bambu_print_plugin.py +++ b/octoprint_bambu_printer/bambu_print_plugin.py @@ -36,8 +36,6 @@ class BambuPrintPlugin( octoprint.plugin.BlueprintPlugin, ): _logger: logging.Logger - _printer: octoprint.printer.PrinterInterface - _settings: octoprint.settings.Settings _plugin_manager: octoprint.plugin.PluginManager def get_assets(self): diff --git a/octoprint_bambu_printer/printer/states/paused_state.py b/octoprint_bambu_printer/printer/states/paused_state.py index 8a8c852..f50c14f 100644 --- a/octoprint_bambu_printer/printer/states/paused_state.py +++ b/octoprint_bambu_printer/printer/states/paused_state.py @@ -1,3 +1,4 @@ +from __future__ import annotations from typing import TYPE_CHECKING if TYPE_CHECKING: diff --git a/test/test_gcode_execution.py b/test/test_gcode_execution.py index e169dda..083585f 100644 --- a/test/test_gcode_execution.py +++ b/test/test_gcode_execution.py @@ -1,4 +1,7 @@ from __future__ import annotations +from unittest.mock import MagicMock + +import octoprint.settings from octoprint_bambu_printer.bambu_print_plugin import BambuPrintPlugin from octoprint_bambu_printer.printer.bambu_virtual_printer import BambuVirtualPrinter @@ -12,10 +15,20 @@ from pytest import fixture @fixture -def printer(): - printer = BambuPrintPlugin().virtual_printer_factory(None, 5000, 115200, 5) +def plugin(): + plugin = BambuPrintPlugin() + plugin._settings = MagicMock() + plugin._settings.get(["serial"]).return_value = "login" + plugin._settings.get(["access_code"]).return_value = "token" + plugin._settings.get(["host"]).return_value = "192.168.0.20" + plugin._settings.get_plugin_logfile_path(["host"]).return_value = "./test_log.log" + return plugin + + +@fixture +def printer(plugin): + printer = plugin.virtual_printer_factory(None, "BAMBU", 115200, 5) assert printer is not None - printer._bambu_client return printer