@@ -0,0 +1,21 @@
+name: Tests
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  pytest:
+    runs-on: "ubuntu-latest"
+    steps:
+      - uses: "actions/checkout@v4"
+      - name: Set up Python
+        uses: "actions/setup-python@v5"
+        with:
+          python-version: "3.10"
+      - name: Install test requirements
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r requirements_test.txt
+      - name: Run pytest
+        run: pytest
@@ -787,8 +787,26 @@ instead of ratcheting down.
 **Files**: `solar_surplus.py` (`_handle_surplus_increase` entry-point clear),
 `const.py` + `manifest.json` (VERSION); tests: `tests/test_solar_surplus.py`
 (`test_surplus_increase_clears_stale_drop_timer`, covering the early-return path).
-`VERSION = "2.7.2"`. Full suite green except the pre-existing environment-only
-baseline failures (identical on clean master).
+`VERSION = "2.7.2"`.
+
+**Test baseline made fully green (infra, no integration code change).** The
+long-standing "~19–22 pre-existing environmental baseline failures" were a
+misdiagnosis — all were **stale tests that drifted from the code after the
+v1.5.11 / v1.6.0 refactors**, now fixed so the suite is **232 passed / 0
+failed**: (a) `test_solar_surplus` grid-import/stability tests mocked `time.time`
+/ `solar_surplus.datetime` but the code uses `time.monotonic()` / `dt_util.now()`
+(no-op mocks); (b) the shared `mock_charger_controller` fixture returned `bool`
+where the real `ChargerController` returns `OperationResult` (callers read
+`result.success`) — fixed in `tests/conftest.py` via `_ok_result()`, plus a
+stale `_session_state` assertion and a wall-clock grid-import trigger under a
+patched clock in `test_night_smart_charge`; (c) `test_charger_controller`
+rate-limit test used a naive `datetime.now()` against the controller's aware
+`dt_util.now()`; (d) `test_entity_platforms` had stale hardcoded entity counts
+and a PV-only fixture that then looked up battery-only entities (`_mock_entry`
+now maps `CONF_SOC_HOME`; counts → 34/21/4/9). `requirements_test.txt` pins
+`pytest-homeassistant-custom-component==0.12.49` (was `>=`) and a new
+`.github/workflows/tests.yml` runs `pytest` on push/PR so the baseline can't
+silently rot again.
 
 ---
 
 
@@ -1,4 +1,7 @@
 pytest
-pytest-homeassistant-custom-component>=0.12.49
+# Pinned: this version pins homeassistant==2023.1.7, the HA the suite is
+# verified green against. An unpinned range lets CI pull a newer HA whose
+# entity/selector behaviour differs and silently reintroduces failures.
+pytest-homeassistant-custom-component==0.12.49
 pytest-asyncio
 pytest-cov
@@ -2,8 +2,22 @@
 import pytest
 from unittest.mock import patch, AsyncMock, Mock
 
+from custom_components.ev_smart_charger.charger_controller import OperationResult
+
 pytest_plugins = "pytest_homeassistant_custom_component"
 
+
+def _ok_result(operation, amperage=None):
+    """Build a successful OperationResult, matching the real ChargerController.
+
+    The controller's start/stop/set methods return an OperationResult (with a
+    .success attribute), NOT a bool. Mocks must mirror that or callers like
+    night_smart_charge (`result.success`) raise AttributeError on a bool.
+    """
+    return OperationResult(
+        success=True, operation=operation, reason="mock", amperage=amperage
+    )
+
 @pytest.fixture(autouse=True)
 def auto_enable_custom_integrations(enable_custom_integrations):
     """Enable custom integrations defined in the test dir."""
@@ -21,9 +35,9 @@ def mock_charger_controller():
     """Mock ChargerController."""
     with patch("custom_components.ev_smart_charger.charger_controller.ChargerController") as mock:
         instance = mock.return_value
-        instance.start_charger = AsyncMock(return_value=True)
-        instance.stop_charger = AsyncMock(return_value=True)
-        instance.set_amperage = AsyncMock(return_value=True)
+        instance.start_charger = AsyncMock(return_value=_ok_result("start"))
+        instance.stop_charger = AsyncMock(return_value=_ok_result("stop"))
+        instance.set_amperage = AsyncMock(return_value=_ok_result("set_amperage"))
         instance.is_charging = AsyncMock(return_value=False)
         instance.get_current_amperage = AsyncMock(return_value=0)
         yield instance
 
@@ -5,6 +5,7 @@
 from unittest.mock import AsyncMock, patch
 
 import pytest
+from homeassistant.util import dt as dt_util
 
 from custom_components.ev_smart_charger.charger_controller import ChargerController
 from custom_components.ev_smart_charger.const import (
@@ -133,7 +134,9 @@ async def test_rate_limiting_waits_instead_of_queue(
     hass.states.async_set("number.charger_current", "6")
     controller = controller_factory()
     await controller.async_setup()
-    controller._last_operation_time = datetime.now()
+    # Must be timezone-aware: the controller computes the rate-limit delta with
+    # dt_util.now() (aware); a naive datetime.now() raises on the subtraction.
+    controller._last_operation_time = dt_util.now()
 
     with patch("asyncio.sleep", new=AsyncMock()) as sleep_mock:
         result = await controller.start_charger(10, reason="Rate limited")
 
@@ -27,6 +27,7 @@ class TimeEntity:
 from custom_components.ev_smart_charger.const import (
     CHARGING_PROFILES,
     CONF_SOC_CAR,
+    CONF_SOC_HOME,
     DEFAULT_CAR_READY_TIME,
     LEGACY_CHARGING_PROFILES,
     PROFILE_MANUAL,
@@ -36,10 +37,14 @@ class TimeEntity:
 
 def _mock_entry(runtime_data: EVSCRuntimeData) -> SimpleNamespace:
     """Create a minimal config-entry-like object for platform setup."""
+    # Include CONF_SOC_HOME so the home-battery-only entities are created
+    # (platforms gate them on has_home_battery(entry.data)). Without it the
+    # battery-only lookups below — e.g. evsc_preserve_home_battery — raise
+    # StopIteration, and the entity counts reflect PV-only mode.
     return SimpleNamespace(
         entry_id="entry_123",
         runtime_data=runtime_data,
-        data={CONF_SOC_CAR: "sensor.cloud_ev_soc"},
+        data={CONF_SOC_CAR: "sensor.cloud_ev_soc", CONF_SOC_HOME: "sensor.home_soc"},
     )
 
 
@@ -74,7 +79,8 @@ async def test_number_platform_setup_and_restore(hass, runtime_data):
 
     await number_platform.async_setup_entry(hass, entry, async_add_entities)
 
-    assert len(entities) == 24
+    # 23 always-created + 11 home-battery-only numbers (see _mock_entry).
+    assert len(entities) == 34
 
     entity = entities[0]
     assert entity.entity_id == "number.ev_smart_charger_entry_123_evsc_check_interval"
@@ -108,7 +114,8 @@ async def test_switch_platform_setup_restore_and_toggle(hass, runtime_data):
 
     await switch_platform.async_setup_entry(hass, entry, async_add_entities)
 
-    assert len(entities) == 19
+    # 19 always-created + 2 home-battery-only switches (use/preserve home battery).
+    assert len(entities) == 21
 
     restored_switch = next(
         entity for entity in entities if entity.entity_id.endswith("evsc_forza_ricarica")
@@ -188,7 +195,8 @@ async def test_time_platform_restore_invalid_restore_and_set_value(hass, runtime
 
     await time_platform.async_setup_entry(hass, entry, async_add_entities)
 
-    assert len(entities) == 2
+    # night_charge_time, car_ready_time, boost_schedule_{start,end}_time.
+    assert len(entities) == 4
 
     restored_time = entities[0]
     default_time = entities[1]
@@ -225,7 +233,8 @@ async def test_sensor_platform_setup_publish_restore_and_log_manager(hass, runti
 
     await sensor_platform.async_setup_entry(hass, entry, async_add_entities)
 
-    assert len(entities) == 7
+    # 8 always-created + 1 home-battery-only sensor (today_home_target).
+    assert len(entities) == 9
 
     diagnostic = next(entity for entity in entities if entity.entity_id.endswith("evsc_diagnostic"))
     priority = next(
 
@@ -583,7 +583,10 @@ async def test_monitor_battery_stops_terminal_on_persistent_grid_import_when_car
     night_charge._session_state = "active"
     night_charge._last_completion_time = None
     night_charge._last_completion_date = None
-    night_charge._grid_import_trigger_time = datetime.now() - timedelta(seconds=60)
+    # Must be relative to the PATCHED dt_util.now below (2026-03-07 02:00), not
+    # the real clock — should_reduce() computes elapsed against dt_util.now(),
+    # so a wall-clock trigger here yields a huge negative elapsed and never fires.
+    night_charge._grid_import_trigger_time = datetime(2026, 3, 7, 2, 0, 0) - timedelta(seconds=60)
 
     hass.states.async_set("sensor.grid_import", "120")
     hass.states.async_set("number.test_evsc_grid_import_threshold", "50")
@@ -706,7 +709,10 @@ async def test_battery_monitor_stands_down_when_coordinator_ownership_is_lost(ha
     unsub.assert_called_once()
     assert night_charge.is_active() is False
     assert night_charge.get_active_mode() == NIGHT_CHARGE_MODE_IDLE
-    assert night_charge._session_state == "ready"
+    # Control loss routes through _handle_control_loss, which sets
+    # "completed_today" (not "ready") to block same-day re-activation and the
+    # restart loop fixed in v1.5.11.
+    assert night_charge._session_state == "completed_today"
 
 
 # ============================================================================
 
@@ -345,7 +345,10 @@ async def mock_start_charger_side_effect(*args, **kwargs):
         # CHECK: State must be active HERE, inside the start command
         assert night_charge.is_active() is True
         assert night_charge.get_active_mode() == NIGHT_CHARGE_MODE_GRID
-        return True
+        # Real ChargerController returns OperationResult, not bool — callers
+        # read result.success.
+        from custom_components.ev_smart_charger.charger_controller import OperationResult
+        return OperationResult(success=True, operation="start", reason="mock")
 
     night_charge.charger_controller.start_charger = AsyncMock(side_effect=mock_start_charger_side_effect)
 
 
@@ -105,22 +105,22 @@ async def test_grid_import_protection(hass, automation):
     hass.states.async_set("number.grid_delay", "30")
 
     # Initial high import - should start timer
-    with patch("time.time", return_value=1000):
+    with patch("time.monotonic", return_value=1000):
         await automation._handle_grid_import_protection(
             grid_import=100, grid_threshold=50, grid_import_delay=30, current_amps=16
         )
         assert automation._last_grid_import_high == 1000
         automation.charger_controller.set_amperage.assert_not_called()
 
     # Still high, delay not elapsed
-    with patch("time.time", return_value=1020): # +20s
+    with patch("time.monotonic", return_value=1020): # +20s
         await automation._handle_grid_import_protection(
             grid_import=100, grid_threshold=50, grid_import_delay=30, current_amps=16
         )
         automation.charger_controller.set_amperage.assert_not_called()
 
     # Delay elapsed - should reduce amperage
-    with patch("time.time", return_value=1031): # +31s
+    with patch("time.monotonic", return_value=1031): # +31s
         await automation._handle_grid_import_protection(
             grid_import=100, grid_threshold=50, grid_import_delay=30, current_amps=16
         )
@@ -132,7 +132,7 @@ async def test_grid_import_protection_publishes_debug_diagnostics(hass, automati
     """Grid import protection should publish diagnostic decisions and timing context."""
     automation._update_diagnostic_sensor = AsyncMock()
 
-    with patch("time.time", return_value=1000):
+    with patch("time.monotonic", return_value=1000):
         await automation._handle_grid_import_protection(
             grid_import=400, grid_threshold=250, grid_import_delay=30, current_amps=24
         )
@@ -145,7 +145,7 @@ async def test_grid_import_protection_publishes_debug_diagnostics(hass, automati
     assert first_call.args[1]["current_charging_a"] == 24
     assert first_call.args[1]["use_home_battery_enabled"] is False
 
-    with patch("time.time", return_value=1020):
+    with patch("time.monotonic", return_value=1020):
         await automation._handle_grid_import_protection(
             grid_import=400, grid_threshold=250, grid_import_delay=30, current_amps=24
         )
@@ -156,7 +156,7 @@ async def test_grid_import_protection_publishes_debug_diagnostics(hass, automati
     assert second_call.args[1]["grid_import_elapsed_s"] == 20.0
     assert second_call.args[1]["grid_import_remaining_s"] == 10.0
 
-    with patch("time.time", return_value=1031):
+    with patch("time.monotonic", return_value=1031):
         await automation._handle_grid_import_protection(
             grid_import=400, grid_threshold=250, grid_import_delay=30, current_amps=24
         )
@@ -170,14 +170,14 @@ async def test_grid_import_protection_publishes_debug_diagnostics(hass, automati
 async def test_grid_import_protection_keeps_charger_off_when_already_off(hass, automation):
     """When import is high and charger is OFF, protection must not start charging."""
     # Initial high import - start timer
-    with patch("time.time", return_value=2000):
+    with patch("time.monotonic", return_value=2000):
         await automation._handle_grid_import_protection(
             grid_import=100, grid_threshold=50, grid_import_delay=30, current_amps=0
         )
         assert automation._last_grid_import_high == 2000
 
     # Delay elapsed - charger should remain OFF
-    with patch("time.time", return_value=2031):
+    with patch("time.monotonic", return_value=2031):
         await automation._handle_grid_import_protection(
             grid_import=100, grid_threshold=50, grid_import_delay=30, current_amps=0
         )
@@ -191,8 +191,9 @@ async def test_surplus_increase_stability(hass, automation):
     # Setup
     automation.charger_controller.is_charging.return_value = True
 
-    # Initial increase detection
-    with patch("custom_components.ev_smart_charger.solar_surplus.datetime") as mock_dt:
+    # Initial increase detection. The code reads dt_util.now() (not
+    # datetime.now()), so patch that symbol or the mock is a no-op.
+    with patch("custom_components.ev_smart_charger.solar_surplus.dt_util") as mock_dt:
         mock_dt.now.return_value = datetime(2023, 1, 1, 12, 0, 0)
 
         await automation._handle_surplus_increase(target_amps=16, current_amps=10)