diff --git a/esphome/__main__.py b/esphome/__main__.py index bdf2730e50..7879cdad0c 100644 --- a/esphome/__main__.py +++ b/esphome/__main__.py @@ -752,7 +752,7 @@ def upload_using_esptool( ), ] for image in idedata.extra_flash_images: - if not Path(image.path).is_file(): + if not image.path.is_file(): _LOGGER.warning( "Skipping missing flash image declared by platform: %s", image.path, diff --git a/esphome/components/light/light_call.h b/esphome/components/light/light_call.h index 054f1b1571..e3352de727 100644 --- a/esphome/components/light/light_call.h +++ b/esphome/components/light/light_call.h @@ -223,7 +223,7 @@ class LightCall { inline bool get_save_() { return (this->flags_ & FLAG_SAVE) != 0; } // Helper to set flag - defaults to true for common case - void set_flag_(FieldFlags flag, bool value = true) { + void set_flag_(FieldFlags flag, bool value = true) ESPHOME_ALWAYS_INLINE { if (value) { this->flags_ |= flag; } else { @@ -232,7 +232,7 @@ class LightCall { } // Helper to clear flag - reduces code size for common case - void clear_flag_(FieldFlags flag) { this->flags_ &= ~flag; } + void clear_flag_(FieldFlags flag) ESPHOME_ALWAYS_INLINE { this->flags_ &= ~flag; } // Helper to log unsupported feature and clear flag - reduces code duplication void log_and_clear_unsupported_(FieldFlags flag, const LogString *feature, bool use_color_mode_log); diff --git a/tests/unit_tests/test_main.py b/tests/unit_tests/test_main.py index 195ef72f3b..e07b4accf2 100644 --- a/tests/unit_tests/test_main.py +++ b/tests/unit_tests/test_main.py @@ -1261,7 +1261,7 @@ def test_upload_using_esptool_skips_missing_extra_flash_images( config = {CONF_ESPHOME: {"platformio_options": {}}} - with caplog.at_level(logging.WARNING): + with caplog.at_level(logging.WARNING, logger="esphome.__main__"): result = upload_using_esptool(config, "/dev/ttyUSB0", None, None) assert result == 0