Improve typing for get_x_for_target commands

homeassistant/bootstrap.py

@@ -624,16 +624,13 @@ async def async_enable_logging(
 
     if log_file is None:
         default_log_path = hass.config.path(ERROR_LOG_FILENAME)
-        if "SUPERVISOR" in os.environ and "HA_DUPLICATE_LOG_FILE" not in os.environ:
+        if "SUPERVISOR" in os.environ:
+            _LOGGER.info("Running in Supervisor, not logging to file")
             # Rename the default log file if it exists, since previous versions created
             # it even on Supervisor
-            def rename_old_file() -> None:
-                """Rename old log file in executor."""
-                if os.path.isfile(default_log_path):
-                    with contextlib.suppress(OSError):
-                        os.rename(default_log_path, f"{default_log_path}.old")
-
-            await hass.async_add_executor_job(rename_old_file)
+            if os.path.isfile(default_log_path):
+                with contextlib.suppress(OSError):
+                    os.rename(default_log_path, f"{default_log_path}.old")
             err_log_path = None
         else:
             err_log_path = default_log_path

homeassistant/components/autarco/manifest.json

@@ -6,6 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/autarco",
   "integration_type": "hub",
   "iot_class": "cloud_polling",
-  "quality_scale": "silver",
   "requirements": ["autarco==3.2.0"]
 }

homeassistant/components/automation/__init__.py

@@ -130,7 +130,6 @@ _EXPERIMENTAL_TRIGGER_PLATFORMS = {
     "cover",
     "device_tracker",
     "fan",
-    "input_boolean",
     "lawn_mower",
     "light",
     "media_player",

homeassistant/components/icloud/account.py

@@ -108,7 +108,7 @@ class IcloudAccount:
 
             if self.api.requires_2fa:
                 # Trigger a new log in to ensure the user enters the 2FA code again.
-                raise PyiCloudFailedLoginException("2FA Required")  # noqa: TRY301
+                raise PyiCloudFailedLoginException  # noqa: TRY301
 
         except PyiCloudFailedLoginException:
             self.api = None

homeassistant/components/input_boolean/icons.json

@@ -20,13 +20,5 @@
     "turn_on": {
       "service": "mdi:toggle-switch"
     }
-  },
-  "triggers": {
-    "turned_off": {
-      "trigger": "mdi:toggle-switch-off"
-    },
-    "turned_on": {
-      "trigger": "mdi:toggle-switch"
-    }
   }
 }

homeassistant/components/input_boolean/strings.json

@@ -1,8 +1,4 @@
 {
-  "common": {
-    "trigger_behavior_description": "The behavior of the targeted input booleans to trigger on.",
-    "trigger_behavior_name": "Behavior"
-  },
   "entity_component": {
     "_": {
       "name": "[%key:component::input_boolean::title%]",
@@ -21,15 +17,6 @@
       }
     }
   },
-  "selector": {
-    "trigger_behavior": {
-      "options": {
-        "any": "Any",
-        "first": "First",
-        "last": "Last"
-      }
-    }
-  },
   "services": {
     "reload": {
       "description": "Reloads helpers from the YAML-configuration.",
@@ -48,27 +35,5 @@
       "name": "[%key:common::action::turn_on%]"
     }
   },
-  "title": "Input boolean",
-  "triggers": {
-    "turned_off": {
-      "description": "Triggers after one or more input booleans turn off.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::input_boolean::common::trigger_behavior_description%]",
-          "name": "[%key:component::input_boolean::common::trigger_behavior_name%]"
-        }
-      },
-      "name": "Input boolean turned off"
-    },
-    "turned_on": {
-      "description": "Triggers after one or more input booleans turn on.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::input_boolean::common::trigger_behavior_description%]",
-          "name": "[%key:component::input_boolean::common::trigger_behavior_name%]"
-        }
-      },
-      "name": "Input boolean turned on"
-    }
-  }
+  "title": "Input boolean"
 }

homeassistant/components/input_boolean/trigger.py

@@ -1,17 +0,0 @@
-"""Provides triggers for input booleans."""
-
-from homeassistant.const import STATE_OFF, STATE_ON
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.trigger import Trigger, make_entity_target_state_trigger
-
-from . import DOMAIN
-
-TRIGGERS: dict[str, type[Trigger]] = {
-    "turned_on": make_entity_target_state_trigger(DOMAIN, STATE_ON),
-    "turned_off": make_entity_target_state_trigger(DOMAIN, STATE_OFF),
-}
-
-
-async def async_get_triggers(hass: HomeAssistant) -> dict[str, type[Trigger]]:
-    """Return the triggers for input booleans."""
-    return TRIGGERS

homeassistant/components/input_boolean/triggers.yaml

@@ -1,18 +0,0 @@
-.trigger_common: &trigger_common
-  target:
-    entity:
-      domain: input_boolean
-  fields:
-    behavior:
-      required: true
-      default: any
-      selector:
-        select:
-          options:
-            - first
-            - last
-            - any
-          translation_key: trigger_behavior
-
-turned_off: *trigger_common
-turned_on: *trigger_common

homeassistant/components/meteo_france/manifest.json

@@ -1,10 +1,9 @@
 {
   "domain": "meteo_france",
-  "name": "Météo-France",
+  "name": "M\u00e9t\u00e9o-France",
   "codeowners": ["@hacf-fr", "@oncleben31", "@Quentame"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/meteo_france",
-  "integration_type": "service",
   "iot_class": "cloud_polling",
   "loggers": ["meteofrance_api"],
   "requirements": ["meteofrance-api==1.4.0"]

homeassistant/components/roborock/manifest.json

@@ -20,7 +20,7 @@
   "loggers": ["roborock"],
   "quality_scale": "silver",
   "requirements": [
-    "python-roborock==3.18.0",
+    "python-roborock==3.12.2",
     "vacuum-map-parser-roborock==0.1.4"
   ]
 }

homeassistant/components/telegram_bot/__init__.py

@@ -63,7 +63,6 @@ from .const import (
     ATTR_PASSWORD,
     ATTR_QUESTION,
     ATTR_REACTION,
-    ATTR_REPLY_TO_MSGID,
     ATTR_RESIZE_KEYBOARD,
     ATTR_SHOW_ALERT,
     ATTR_STICKER_ID,
@@ -127,26 +126,21 @@ BASE_SERVICE_SCHEMA = vol.Schema(
         vol.Optional(ATTR_TIMEOUT): cv.positive_int,
         vol.Optional(ATTR_MESSAGE_TAG): cv.string,
         vol.Optional(ATTR_MESSAGE_THREAD_ID): vol.Coerce(int),
-    }
+    },
+    extra=vol.ALLOW_EXTRA,
 )
 
 SERVICE_SCHEMA_SEND_MESSAGE = vol.All(
     cv.deprecated(ATTR_TIMEOUT),
     BASE_SERVICE_SCHEMA.extend(
-        {
-            vol.Required(ATTR_MESSAGE): cv.string,
-            vol.Optional(ATTR_TITLE): cv.string,
-            vol.Optional(ATTR_REPLY_TO_MSGID): vol.Coerce(int),
-        }
+        {vol.Required(ATTR_MESSAGE): cv.string, vol.Optional(ATTR_TITLE): cv.string}
     ),
 )
 
 SERVICE_SCHEMA_SEND_CHAT_ACTION = vol.All(
     cv.deprecated(ATTR_TIMEOUT),
-    vol.Schema(
+    BASE_SERVICE_SCHEMA.extend(
         {
-            vol.Optional(CONF_CONFIG_ENTRY_ID): cv.string,
-            vol.Optional(ATTR_TARGET): vol.All(cv.ensure_list, [vol.Coerce(int)]),
             vol.Required(ATTR_CHAT_ACTION): vol.In(
                 (
                     CHAT_ACTION_TYPING,
@@ -162,7 +156,6 @@ SERVICE_SCHEMA_SEND_CHAT_ACTION = vol.All(
                     CHAT_ACTION_UPLOAD_VIDEO_NOTE,
                 )
             ),
-            vol.Optional(ATTR_MESSAGE_THREAD_ID): vol.Coerce(int),
         }
     ),
 )
@@ -176,7 +169,6 @@ SERVICE_SCHEMA_BASE_SEND_FILE = BASE_SERVICE_SCHEMA.extend(
         vol.Optional(ATTR_PASSWORD): cv.string,
         vol.Optional(ATTR_AUTHENTICATION): cv.string,
         vol.Optional(ATTR_VERIFY_SSL): cv.boolean,
-        vol.Optional(ATTR_REPLY_TO_MSGID): vol.Coerce(int),
     }
 )
 
@@ -196,7 +188,6 @@ SERVICE_SCHEMA_SEND_LOCATION = vol.All(
         {
             vol.Required(ATTR_LONGITUDE): cv.string,
             vol.Required(ATTR_LATITUDE): cv.string,
-            vol.Optional(ATTR_REPLY_TO_MSGID): vol.Coerce(int),
         }
     ),
 )
@@ -214,25 +205,18 @@ SERVICE_SCHEMA_SEND_POLL = vol.All(
             vol.Optional(ATTR_ALLOWS_MULTIPLE_ANSWERS, default=False): cv.boolean,
             vol.Optional(ATTR_DISABLE_NOTIF): cv.boolean,
             vol.Optional(ATTR_MESSAGE_THREAD_ID): vol.Coerce(int),
-            vol.Optional(ATTR_REPLY_TO_MSGID): vol.Coerce(int),
         }
     ),
 )
 
 SERVICE_SCHEMA_EDIT_MESSAGE = vol.All(
     cv.deprecated(ATTR_TIMEOUT),
-    vol.Schema(
+    SERVICE_SCHEMA_BASE_SEND_FILE.extend(
         {
-            vol.Optional(CONF_CONFIG_ENTRY_ID): cv.string,
-            vol.Optional(ATTR_TITLE): cv.string,
-            vol.Required(ATTR_MESSAGE): cv.string,
             vol.Required(ATTR_MESSAGEID): vol.Any(
                 cv.positive_int, vol.All(cv.string, "last")
             ),
             vol.Required(ATTR_CHAT_ID): vol.Coerce(int),
-            vol.Optional(ATTR_PARSER): cv.string,
-            vol.Optional(ATTR_KEYBOARD_INLINE): cv.ensure_list,
-            vol.Optional(ATTR_DISABLE_WEB_PREV): cv.boolean,
         }
     ),
 )

homeassistant/components/telegram_bot/bot.py

@@ -783,7 +783,6 @@ class TelegramNotificationService:
                 None,
                 chat_id=chat_id,
                 action=chat_action,
-                message_thread_id=kwargs.get(ATTR_MESSAGE_THREAD_ID),
                 context=context,
             )
             result[chat_id] = is_successful

homeassistant/components/websocket_api/automation.py

@@ -4,6 +4,7 @@ from __future__ import annotations
 
 from collections.abc import Mapping
 from dataclasses import dataclass
+from enum import StrEnum
 import logging
 from typing import Any, Self
 
@@ -34,10 +35,21 @@ FLATTENED_SERVICE_DESCRIPTIONS_CACHE: HassKey[
 ] = HassKey("websocket_automation_flat_service_description_cache")
 
 AUTOMATION_COMPONENT_LOOKUP_CACHE: HassKey[
-    dict[str, tuple[Mapping[str, Any], _AutomationComponentLookupTable]]
+    dict[
+        AutomationComponentType,
+        tuple[Mapping[str, Any], _AutomationComponentLookupTable],
+    ]
 ] = HassKey("websocket_automation_component_lookup_cache")
 
 
+class AutomationComponentType(StrEnum):
+    """Types of automation components."""
+
+    TRIGGERS = "triggers"
+    CONDITIONS = "conditions"
+    SERVICES = "services"
+
+
 @dataclass(slots=True, kw_only=True)
 class _EntityFilter:
     """Single entity filter configuration."""
@@ -152,7 +164,7 @@ def _get_automation_component_domains(
 
 def _get_automation_component_lookup_table(
     hass: HomeAssistant,
-    component_type: str,
+    component_type: AutomationComponentType,
     component_descriptions: Mapping[str, Mapping[str, Any] | None],
 ) -> _AutomationComponentLookupTable:
     """Get a dict of automation components keyed by domain, along with the total number of components.
@@ -168,11 +180,12 @@ def _get_automation_component_lookup_table(
     if (cached := cache.get(component_type)) is not None:
         cached_descriptions, cached_lookup = cached
         if cached_descriptions is component_descriptions:
-            _LOGGER.debug(
-                "Using cached automation component lookup data for %s", component_type
-            )
             return cached_lookup
 
+    _LOGGER.debug(
+        "Automation component lookup data for %s has no cache yet", component_type
+    )
+
     lookup_table = _AutomationComponentLookupTable(
         domain_components={}, component_count=0
     )
@@ -194,7 +207,7 @@ def _get_automation_component_lookup_table(
 
 def _async_get_automation_components_for_target(
     hass: HomeAssistant,
-    component_type: str,
+    component_type: AutomationComponentType,
     target_selection: ConfigType,
     expand_group: bool,
     component_descriptions: Mapping[str, Mapping[str, Any] | None],
@@ -253,7 +266,11 @@ async def async_get_triggers_for_target(
     """Get triggers for a target."""
     descriptions = await async_get_all_trigger_descriptions(hass)
     return _async_get_automation_components_for_target(
-        hass, "triggers", target_selector, expand_group, descriptions
+        hass,
+        AutomationComponentType.TRIGGERS,
+        target_selector,
+        expand_group,
+        descriptions,
     )
 
 
@@ -263,7 +280,11 @@ async def async_get_conditions_for_target(
     """Get conditions for a target."""
     descriptions = await async_get_all_condition_descriptions(hass)
     return _async_get_automation_components_for_target(
-        hass, "conditions", target_selector, expand_group, descriptions
+        hass,
+        AutomationComponentType.CONDITIONS,
+        target_selector,
+        expand_group,
+        descriptions,
     )
 
 
@@ -297,7 +318,7 @@ async def async_get_services_for_target(
 
     return _async_get_automation_components_for_target(
         hass,
-        "services",
+        AutomationComponentType.SERVICES,
         target_selector,
         expand_group,
         get_flattened_service_descriptions(),

homeassistant/generated/integrations.json

@@ -3938,7 +3938,7 @@
     },
     "meteo_france": {
       "name": "M\u00e9t\u00e9o-France",
-      "integration_type": "service",
+      "integration_type": "hub",
       "config_flow": true,
       "iot_class": "cloud_polling"
     },

requirements_all.txt

@@ -2575,7 +2575,7 @@ python-rabbitair==0.0.8
 python-ripple-api==0.0.3
 
 # homeassistant.components.roborock
-python-roborock==3.18.0
+python-roborock==3.12.2
 
 # homeassistant.components.smarttub
 python-smarttub==0.0.46

requirements_test_all.txt

@@ -2159,7 +2159,7 @@ python-pooldose==0.8.1
 python-rabbitair==0.0.8
 
 # homeassistant.components.roborock
-python-roborock==3.18.0
+python-roborock==3.12.2
 
 # homeassistant.components.smarttub
 python-smarttub==0.0.46

script/hassfest/quality_scale.py

@@ -1176,6 +1176,7 @@ INTEGRATIONS_WITHOUT_SCALE = [
     "aten_pe",
     "atome",
     "august",
+    "autarco",
     "aurora",
     "aurora_abb_powerone",
     "aussie_broadband",

tests/components/camera/conftest.py

@@ -148,22 +148,6 @@ def mock_stream_source_fixture() -> Generator[AsyncMock]:
         yield mock_stream_source
 
 
-@pytest.fixture(name="mock_create_stream")
-def mock_create_stream_fixture() -> Generator[Mock]:
-    """Fixture to mock create_stream and prevent real stream threads."""
-    mock_stream = Mock()
-    mock_stream.add_provider = Mock()
-    mock_stream.start = AsyncMock()
-    mock_stream.endpoint_url = Mock(return_value="http://home.assistant/playlist.m3u8")
-    mock_stream.set_update_callback = Mock()
-    mock_stream.available = True
-    with patch(
-        "homeassistant.components.camera.create_stream",
-        return_value=mock_stream,
-    ):
-        yield mock_stream
-
-
 @pytest.fixture
 async def mock_test_webrtc_cameras(hass: HomeAssistant) -> None:
     """Initialize test WebRTC cameras with native RTC support."""

tests/components/camera/test_init.py

@@ -346,14 +346,20 @@ async def test_websocket_stream_no_source(
 
 @pytest.mark.usefixtures("mock_camera", "mock_stream")
 async def test_websocket_camera_stream(
-    hass: HomeAssistant, hass_ws_client: WebSocketGenerator, mock_create_stream: Mock
+    hass: HomeAssistant, hass_ws_client: WebSocketGenerator
 ) -> None:
     """Test camera/stream websocket command."""
     await async_setup_component(hass, "camera", {})
 
-    with patch(
-        "homeassistant.components.demo.camera.DemoCamera.stream_source",
-        return_value="http://example.com",
+    with (
+        patch(
+            "homeassistant.components.camera.Stream.endpoint_url",
+            return_value="http://home.assistant/playlist.m3u8",
+        ) as mock_stream_view_url,
+        patch(
+            "homeassistant.components.demo.camera.DemoCamera.stream_source",
+            return_value="http://example.com",
+        ),
     ):
         # Request playlist through WebSocket
         client = await hass_ws_client(hass)
@@ -363,7 +369,7 @@ async def test_websocket_camera_stream(
         msg = await client.receive_json()
 
         # Assert WebSocket response
-        assert mock_create_stream.endpoint_url.called
+        assert mock_stream_view_url.called
         assert msg["id"] == 6
         assert msg["type"] == TYPE_RESULT
         assert msg["success"]
@@ -499,18 +505,21 @@ async def test_play_stream_service_no_source(hass: HomeAssistant) -> None:
 
 
 @pytest.mark.usefixtures("mock_camera", "mock_stream")
-async def test_handle_play_stream_service(
-    hass: HomeAssistant, mock_create_stream: Mock
-) -> None:
+async def test_handle_play_stream_service(hass: HomeAssistant) -> None:
     """Test camera play_stream service."""
     await async_process_ha_core_config(
         hass,
         {"external_url": "https://example.com"},
     )
     await async_setup_component(hass, "media_player", {})
-    with patch(
-        "homeassistant.components.demo.camera.DemoCamera.stream_source",
-        return_value="http://example.com",
+    with (
+        patch(
+            "homeassistant.components.camera.Stream.endpoint_url",
+        ) as mock_request_stream,
+        patch(
+            "homeassistant.components.demo.camera.DemoCamera.stream_source",
+            return_value="http://example.com",
+        ),
     ):
         # Call service
         await hass.services.async_call(
@@ -524,14 +533,17 @@ async def test_handle_play_stream_service(
         )
         # So long as we request the stream, the rest should be covered
         # by the play_media service tests.
-        assert mock_create_stream.endpoint_url.called
+        assert mock_request_stream.called
 
 
 @pytest.mark.usefixtures("mock_stream")
-async def test_no_preload_stream(hass: HomeAssistant, mock_create_stream: Mock) -> None:
+async def test_no_preload_stream(hass: HomeAssistant) -> None:
     """Test camera preload preference."""
     demo_settings = camera.DynamicStreamSettings()
     with (
+        patch(
+            "homeassistant.components.camera.Stream.endpoint_url",
+        ) as mock_request_stream,
         patch(
             "homeassistant.components.camera.prefs.CameraPreferences.get_dynamic_stream_settings",
             return_value=demo_settings,
@@ -545,14 +557,15 @@ async def test_no_preload_stream(hass: HomeAssistant, mock_create_stream: Mock)
         await async_setup_component(hass, "camera", {DOMAIN: {"platform": "demo"}})
         hass.bus.async_fire(EVENT_HOMEASSISTANT_STARTED)
         await hass.async_block_till_done()
-        assert not mock_create_stream.endpoint_url.called
+        assert not mock_request_stream.called
 
 
 @pytest.mark.usefixtures("mock_stream")
-async def test_preload_stream(hass: HomeAssistant, mock_create_stream: Mock) -> None:
+async def test_preload_stream(hass: HomeAssistant) -> None:
     """Test camera preload preference."""
     demo_settings = camera.DynamicStreamSettings(preload_stream=True)
     with (
+        patch("homeassistant.components.camera.create_stream") as mock_create_stream,
         patch(
             "homeassistant.components.camera.prefs.CameraPreferences.get_dynamic_stream_settings",
             return_value=demo_settings,
@@ -562,13 +575,14 @@ async def test_preload_stream(hass: HomeAssistant, mock_create_stream: Mock) ->
             return_value="http://example.com",
         ),
     ):
+        mock_create_stream.return_value.start = AsyncMock()
         assert await async_setup_component(
             hass, "camera", {DOMAIN: {"platform": "demo"}}
         )
         await hass.async_block_till_done()
         hass.bus.async_fire(EVENT_HOMEASSISTANT_STARTED)
         await hass.async_block_till_done()
-        assert mock_create_stream.start.called
+        assert mock_create_stream.called
 
 
 @pytest.mark.usefixtures("mock_camera")
@@ -680,16 +694,25 @@ async def test_state_streaming(hass: HomeAssistant) -> None:
     assert demo_camera.state == camera.CameraState.STREAMING
 
 
-@pytest.mark.usefixtures("mock_camera", "mock_stream", "mock_create_stream")
+@pytest.mark.usefixtures("mock_camera", "mock_stream")
 async def test_stream_unavailable(
-    hass: HomeAssistant, hass_ws_client: WebSocketGenerator, mock_create_stream: Mock
+    hass: HomeAssistant, hass_ws_client: WebSocketGenerator
 ) -> None:
     """Camera state."""
     await async_setup_component(hass, "camera", {})
 
-    with patch(
-        "homeassistant.components.demo.camera.DemoCamera.stream_source",
-        return_value="http://example.com",
+    with (
+        patch(
+            "homeassistant.components.camera.Stream.endpoint_url",
+            return_value="http://home.assistant/playlist.m3u8",
+        ),
+        patch(
+            "homeassistant.components.demo.camera.DemoCamera.stream_source",
+            return_value="http://example.com",
+        ),
+        patch(
+            "homeassistant.components.camera.Stream.set_update_callback",
+        ) as mock_update_callback,
     ):
         # Request playlist through WebSocket. We just want to create the stream
         # but don't care about the result.
@@ -698,22 +721,26 @@ async def test_stream_unavailable(
             {"id": 10, "type": "camera/stream", "entity_id": "camera.demo_camera"}
         )
         await client.receive_json()
-        assert mock_create_stream.set_update_callback.called
+        assert mock_update_callback.called
 
     # Simulate the stream going unavailable
-    callback = mock_create_stream.set_update_callback.call_args.args[0]
-    mock_create_stream.available = False
-    callback()
-    await hass.async_block_till_done()
+    callback = mock_update_callback.call_args.args[0]
+    with patch(
+        "homeassistant.components.camera.Stream.available", new_callable=lambda: False
+    ):
+        callback()
+        await hass.async_block_till_done()
 
     demo_camera = hass.states.get("camera.demo_camera")
     assert demo_camera is not None
     assert demo_camera.state == STATE_UNAVAILABLE
 
     # Simulate stream becomes available
-    mock_create_stream.available = True
-    callback()
-    await hass.async_block_till_done()
+    with patch(
+        "homeassistant.components.camera.Stream.available", new_callable=lambda: True
+    ):
+        callback()
+        await hass.async_block_till_done()
 
     demo_camera = hass.states.get("camera.demo_camera")
     assert demo_camera is not None

tests/components/input_boolean/test_trigger.py

@@ -1,228 +0,0 @@
-"""Test input boolean triggers."""
-
-from collections.abc import Generator
-from unittest.mock import patch
-
-import pytest
-
-from homeassistant.components.input_boolean import DOMAIN
-from homeassistant.const import ATTR_LABEL_ID, CONF_ENTITY_ID, STATE_OFF, STATE_ON
-from homeassistant.core import HomeAssistant, ServiceCall
-
-from tests.components import (
-    StateDescription,
-    arm_trigger,
-    parametrize_target_entities,
-    parametrize_trigger_states,
-    set_or_remove_state,
-    target_entities,
-)
-
-
-@pytest.fixture(autouse=True, name="stub_blueprint_populate")
-def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
-    """Stub copying the blueprints to the config folder."""
-
-
-@pytest.fixture(name="enable_experimental_triggers_conditions")
-def enable_experimental_triggers_conditions() -> Generator[None]:
-    """Enable experimental triggers and conditions."""
-    with patch(
-        "homeassistant.components.labs.async_is_preview_feature_enabled",
-        return_value=True,
-    ):
-        yield
-
-
-@pytest.fixture
-async def target_input_booleans(hass: HomeAssistant) -> list[str]:
-    """Create multiple input_boolean entities associated with different targets."""
-    return (await target_entities(hass, DOMAIN))["included"]
-
-
-@pytest.mark.parametrize(
-    "trigger_key",
-    [
-        "input_boolean.turned_off",
-        "input_boolean.turned_on",
-    ],
-)
-async def test_input_boolean_triggers_gated_by_labs_flag(
-    hass: HomeAssistant, caplog: pytest.LogCaptureFixture, trigger_key: str
-) -> None:
-    """Test the input_boolean triggers are gated by the labs flag."""
-    await arm_trigger(hass, trigger_key, None, {ATTR_LABEL_ID: "test_label"})
-    assert (
-        "Unnamed automation failed to setup triggers and has been disabled: Trigger "
-        f"'{trigger_key}' requires the experimental 'New triggers and conditions' "
-        "feature to be enabled in Home Assistant Labs settings (feature flag: "
-        "'new_triggers_conditions')"
-    ) in caplog.text
-
-
-@pytest.mark.usefixtures("enable_experimental_triggers_conditions")
-@pytest.mark.parametrize(
-    ("trigger_target_config", "entity_id", "entities_in_target"),
-    parametrize_target_entities(DOMAIN),
-)
-@pytest.mark.parametrize(
-    ("trigger", "states"),
-    [
-        *parametrize_trigger_states(
-            trigger="input_boolean.turned_off",
-            target_states=[STATE_OFF],
-            other_states=[STATE_ON],
-        ),
-        *parametrize_trigger_states(
-            trigger="input_boolean.turned_on",
-            target_states=[STATE_ON],
-            other_states=[STATE_OFF],
-        ),
-    ],
-)
-async def test_input_boolean_state_trigger_behavior_any(
-    hass: HomeAssistant,
-    service_calls: list[ServiceCall],
-    target_input_booleans: list[str],
-    trigger_target_config: dict,
-    entity_id: str,
-    entities_in_target: int,
-    trigger: str,
-    states: list[StateDescription],
-) -> None:
-    """Test that the input_boolean state trigger fires when any input_boolean state changes to a specific state."""
-    other_entity_ids = set(target_input_booleans) - {entity_id}
-
-    # Set all input_booleans, including the tested one, to the initial state
-    for eid in target_input_booleans:
-        set_or_remove_state(hass, eid, states[0]["included"])
-        await hass.async_block_till_done()
-
-    await arm_trigger(hass, trigger, {}, trigger_target_config)
-
-    for state in states[1:]:
-        included_state = state["included"]
-        set_or_remove_state(hass, entity_id, included_state)
-        await hass.async_block_till_done()
-        assert len(service_calls) == state["count"]
-        for service_call in service_calls:
-            assert service_call.data[CONF_ENTITY_ID] == entity_id
-        service_calls.clear()
-
-        # Check if changing other input_booleans also triggers
-        for other_entity_id in other_entity_ids:
-            set_or_remove_state(hass, other_entity_id, included_state)
-            await hass.async_block_till_done()
-        assert len(service_calls) == (entities_in_target - 1) * state["count"]
-        service_calls.clear()
-
-
-@pytest.mark.usefixtures("enable_experimental_triggers_conditions")
-@pytest.mark.parametrize(
-    ("trigger_target_config", "entity_id", "entities_in_target"),
-    parametrize_target_entities(DOMAIN),
-)
-@pytest.mark.parametrize(
-    ("trigger", "states"),
-    [
-        *parametrize_trigger_states(
-            trigger="input_boolean.turned_off",
-            target_states=[STATE_OFF],
-            other_states=[STATE_ON],
-        ),
-        *parametrize_trigger_states(
-            trigger="input_boolean.turned_on",
-            target_states=[STATE_ON],
-            other_states=[STATE_OFF],
-        ),
-    ],
-)
-async def test_input_boolean_state_trigger_behavior_first(
-    hass: HomeAssistant,
-    service_calls: list[ServiceCall],
-    target_input_booleans: list[str],
-    trigger_target_config: dict,
-    entity_id: str,
-    entities_in_target: int,
-    trigger: str,
-    states: list[StateDescription],
-) -> None:
-    """Test that the input_boolean state trigger fires when the first input_boolean changes to a specific state."""
-    other_entity_ids = set(target_input_booleans) - {entity_id}
-
-    # Set all input_booleans, including the tested one, to the initial state
-    for eid in target_input_booleans:
-        set_or_remove_state(hass, eid, states[0]["included"])
-        await hass.async_block_till_done()
-
-    await arm_trigger(hass, trigger, {"behavior": "first"}, trigger_target_config)
-
-    for state in states[1:]:
-        included_state = state["included"]
-        set_or_remove_state(hass, entity_id, included_state)
-        await hass.async_block_till_done()
-        assert len(service_calls) == state["count"]
-        for service_call in service_calls:
-            assert service_call.data[CONF_ENTITY_ID] == entity_id
-        service_calls.clear()
-
-        # Triggering other input_booleans should not cause the trigger to fire again
-        for other_entity_id in other_entity_ids:
-            set_or_remove_state(hass, other_entity_id, included_state)
-            await hass.async_block_till_done()
-        assert len(service_calls) == 0
-
-
-@pytest.mark.usefixtures("enable_experimental_triggers_conditions")
-@pytest.mark.parametrize(
-    ("trigger_target_config", "entity_id", "entities_in_target"),
-    parametrize_target_entities(DOMAIN),
-)
-@pytest.mark.parametrize(
-    ("trigger", "states"),
-    [
-        *parametrize_trigger_states(
-            trigger="input_boolean.turned_off",
-            target_states=[STATE_OFF],
-            other_states=[STATE_ON],
-        ),
-        *parametrize_trigger_states(
-            trigger="input_boolean.turned_on",
-            target_states=[STATE_ON],
-            other_states=[STATE_OFF],
-        ),
-    ],
-)
-async def test_input_boolean_state_trigger_behavior_last(
-    hass: HomeAssistant,
-    service_calls: list[ServiceCall],
-    target_input_booleans: list[str],
-    trigger_target_config: dict,
-    entity_id: str,
-    entities_in_target: int,
-    trigger: str,
-    states: list[StateDescription],
-) -> None:
-    """Test that the input_boolean state trigger fires when the last input_boolean changes to a specific state."""
-    other_entity_ids = set(target_input_booleans) - {entity_id}
-
-    # Set all input_booleans, including the tested one, to the initial state
-    for eid in target_input_booleans:
-        set_or_remove_state(hass, eid, states[0]["included"])
-        await hass.async_block_till_done()
-
-    await arm_trigger(hass, trigger, {"behavior": "last"}, trigger_target_config)
-
-    for state in states[1:]:
-        included_state = state["included"]
-        for other_entity_id in other_entity_ids:
-            set_or_remove_state(hass, other_entity_id, included_state)
-            await hass.async_block_till_done()
-        assert len(service_calls) == 0
-
-        set_or_remove_state(hass, entity_id, included_state)
-        await hass.async_block_till_done()
-        assert len(service_calls) == state["count"]
-        for service_call in service_calls:
-            assert service_call.data[CONF_ENTITY_ID] == entity_id
-        service_calls.clear()

tests/components/telegram_bot/test_telegram_bot.py

@@ -158,6 +158,7 @@ async def test_polling_platform_init(
         (
             SERVICE_SEND_LOCATION,
             {
+                ATTR_MESSAGE: "test_message",
                 ATTR_MESSAGE_THREAD_ID: "123",
                 ATTR_LONGITUDE: "1.123",
                 ATTR_LATITUDE: "1.123",
@@ -413,7 +414,6 @@ async def test_send_chat_action(
                 CONF_CONFIG_ENTRY_ID: mock_broadcast_config_entry.entry_id,
                 ATTR_TARGET: [123456],
                 ATTR_CHAT_ACTION: CHAT_ACTION_TYPING,
-                ATTR_MESSAGE_THREAD_ID: 123,
             },
             blocking=True,
             return_response=True,
@@ -421,9 +421,7 @@ async def test_send_chat_action(
 
     await hass.async_block_till_done()
     mock.assert_called_once()
-    mock.assert_called_with(
-        chat_id=123456, action=CHAT_ACTION_TYPING, message_thread_id=123
-    )
+    mock.assert_called_with(chat_id=123456, action=CHAT_ACTION_TYPING)
 
 
 @pytest.mark.parametrize(
@@ -1507,6 +1505,7 @@ async def test_set_message_reaction(
             SERVICE_SEND_LOCATION,
             {
                 ATTR_TARGET: 654321,
+                ATTR_MESSAGE: "test_message",
                 ATTR_MESSAGE_THREAD_ID: "123",
                 ATTR_LONGITUDE: "1.123",
                 ATTR_LATITUDE: "1.123",

tests/components/websocket_api/test_commands.py

@@ -3822,9 +3822,7 @@ async def test_get_triggers_conditions_for_target(
             assert msg["success"]
             assert sorted(msg["result"]) == sorted(expected)
 
-            assert (
-                "Using cached automation component lookup data" in caplog.text
-            ) == expect_lookup_cache
+            assert ("has no cache yet" not in caplog.text) == expect_lookup_cache
             caplog.clear()
 
         # Test entity target - unknown entity
@@ -4077,9 +4075,7 @@ async def test_get_services_for_target(
         assert msg["success"]
         assert sorted(msg["result"]) == sorted(expected)
 
-        assert (
-            "Using cached automation component lookup data" in caplog.text
-        ) == expect_lookup_cache
+        assert ("has no cache yet" not in caplog.text) == expect_lookup_cache
         caplog.clear()
 
     # Test entity target - unknown entity

tests/test_bootstrap.py

@@ -130,16 +130,8 @@ async def test_async_enable_logging(
     cleanup_log_files()
 
 
-@pytest.mark.parametrize(
-    ("extra_env", "log_file_count", "old_log_file_count"),
-    [({}, 0, 1), ({"HA_DUPLICATE_LOG_FILE": "1"}, 1, 0)],
-)
 async def test_async_enable_logging_supervisor(
-    hass: HomeAssistant,
-    caplog: pytest.LogCaptureFixture,
-    extra_env: dict[str, str],
-    log_file_count: int,
-    old_log_file_count: int,
+    hass: HomeAssistant, caplog: pytest.LogCaptureFixture
 ) -> None:
     """Test to ensure the default log file is not created on Supervisor installations."""
 
@@ -149,14 +141,14 @@ async def test_async_enable_logging_supervisor(
     assert len(glob.glob(ARG_LOG_FILE)) == 0
 
     with (
-        patch.dict(os.environ, {"SUPERVISOR": "1", **extra_env}),
+        patch.dict(os.environ, {"SUPERVISOR": "1"}),
         patch(
             "homeassistant.bootstrap.async_activate_log_queue_handler"
         ) as mock_async_activate_log_queue_handler,
         patch("logging.getLogger"),
     ):
         await bootstrap.async_enable_logging(hass)
-        assert len(glob.glob(CONFIG_LOG_FILE)) == log_file_count
+        assert len(glob.glob(CONFIG_LOG_FILE)) == 0
         mock_async_activate_log_queue_handler.assert_called_once()
         mock_async_activate_log_queue_handler.reset_mock()
 
@@ -170,10 +162,9 @@ async def test_async_enable_logging_supervisor(
         await hass.async_add_executor_job(write_log_file)
         assert len(glob.glob(CONFIG_LOG_FILE)) == 1
         assert len(glob.glob(f"{CONFIG_LOG_FILE}.old")) == 0
-
         await bootstrap.async_enable_logging(hass)
-        assert len(glob.glob(CONFIG_LOG_FILE)) == log_file_count
-        assert len(glob.glob(f"{CONFIG_LOG_FILE}.old")) == old_log_file_count
+        assert len(glob.glob(CONFIG_LOG_FILE)) == 0
+        assert len(glob.glob(f"{CONFIG_LOG_FILE}.old")) == 1
         mock_async_activate_log_queue_handler.assert_called_once()
         mock_async_activate_log_queue_handler.reset_mock()