From 6395567f2a76d42268bc6d36a36aa8fcc88959f7 Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Tue, 1 Jul 2025 16:19:18 -0500 Subject: [PATCH] type --- .../component_tests/ota/test_web_server_ota.py | 18 +++++++++++------- .../web_server/test_ota_migration.py | 11 ++++++----- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/tests/component_tests/ota/test_web_server_ota.py b/tests/component_tests/ota/test_web_server_ota.py index f8addc6a52..0d8ff6f134 100644 --- a/tests/component_tests/ota/test_web_server_ota.py +++ b/tests/component_tests/ota/test_web_server_ota.py @@ -1,7 +1,9 @@ """Tests for the web_server OTA platform.""" +from collections.abc import Callable -def test_web_server_ota_generated(generate_main): + +def test_web_server_ota_generated(generate_main: Callable[[str], str]) -> None: """Test that web_server OTA platform generates correct code.""" main_cpp = generate_main("tests/component_tests/ota/test_web_server_ota.yaml") @@ -16,7 +18,7 @@ def test_web_server_ota_generated(generate_main): assert "App.register_component(web_server_webserverotacomponent_id)" in main_cpp -def test_web_server_ota_with_callbacks(generate_main): +def test_web_server_ota_with_callbacks(generate_main: Callable[[str], str]) -> None: """Test web_server OTA with state callbacks.""" main_cpp = generate_main( "tests/component_tests/ota/test_web_server_ota_callbacks.yaml" @@ -34,7 +36,7 @@ def test_web_server_ota_with_callbacks(generate_main): assert "OTA error" in main_cpp -def test_web_server_ota_idf_multipart(generate_main): +def test_web_server_ota_idf_multipart(generate_main: Callable[[str], str]) -> None: """Test that ESP-IDF builds include multipart parser dependency.""" main_cpp = generate_main("tests/component_tests/ota/test_web_server_ota_idf.yaml") @@ -46,7 +48,9 @@ def test_web_server_ota_idf_multipart(generate_main): assert "web_server::WebServerOTAComponent" in main_cpp -def test_web_server_ota_without_web_server_fails(generate_main): +def test_web_server_ota_without_web_server_fails( + generate_main: Callable[[str], str], +) -> None: """Test that web_server OTA requires web_server component.""" # This should fail during validation since web_server_base is required # but we can't test validation failures with generate_main @@ -58,7 +62,7 @@ def test_web_server_ota_without_web_server_fails(generate_main): assert "WebServerOTAComponent" in main_cpp -def test_multiple_ota_platforms(generate_main): +def test_multiple_ota_platforms(generate_main: Callable[[str], str]) -> None: """Test multiple OTA platforms can coexist.""" main_cpp = generate_main("tests/component_tests/ota/test_web_server_ota_multi.yaml") @@ -73,7 +77,7 @@ def test_multiple_ota_platforms(generate_main): assert "http_request::OtaHttpRequestComponent" in main_cpp -def test_web_server_ota_arduino_with_auth(generate_main): +def test_web_server_ota_arduino_with_auth(generate_main: Callable[[str], str]) -> None: """Test web_server OTA with Arduino framework and authentication.""" main_cpp = generate_main( "tests/component_tests/ota/test_web_server_ota_arduino.yaml" @@ -87,7 +91,7 @@ def test_web_server_ota_arduino_with_auth(generate_main): assert "set_auth_password" in main_cpp -def test_web_server_ota_esp8266(generate_main): +def test_web_server_ota_esp8266(generate_main: Callable[[str], str]) -> None: """Test web_server OTA on ESP8266 platform.""" main_cpp = generate_main( "tests/component_tests/ota/test_web_server_ota_esp8266.yaml" diff --git a/tests/component_tests/web_server/test_ota_migration.py b/tests/component_tests/web_server/test_ota_migration.py index 7f122e72a7..7f34ec75f6 100644 --- a/tests/component_tests/web_server/test_ota_migration.py +++ b/tests/component_tests/web_server/test_ota_migration.py @@ -3,14 +3,15 @@ import pytest from esphome import config_validation as cv +from esphome.types import ConfigType -def test_web_server_ota_true_fails_validation(): +def test_web_server_ota_true_fails_validation() -> None: """Test that web_server with ota: true fails validation with helpful message.""" from esphome.components.web_server import validate_ota_removed # Config with ota: true should fail - config = {"ota": True} + config: ConfigType = {"ota": True} with pytest.raises(cv.Invalid) as exc_info: validate_ota_removed(config) @@ -22,16 +23,16 @@ def test_web_server_ota_true_fails_validation(): assert "ota:" in error_msg -def test_web_server_ota_false_passes_validation(): +def test_web_server_ota_false_passes_validation() -> None: """Test that web_server with ota: false passes validation.""" from esphome.components.web_server import validate_ota_removed # Config with ota: false should pass - config = {"ota": False} + config: ConfigType = {"ota": False} result = validate_ota_removed(config) assert result == config # Config without ota should also pass - config = {} + config: ConfigType = {} result = validate_ota_removed(config) assert result == config