fix(tests): restore forecast_minutes/minutes_now leaked by two tests (#5079)

test_load_forecast_history and test_rate_text_scan both mutate
forecast_minutes/minutes_now (and, for the latter, end_record/rate_min/
rate_max/rate_import) on the shared PredBat fixture without restoring
them, and each leaked value poisons whichever unrelated test happens to
run next depending on shuffle order.

load_forecast_history's leak specifically comes from its own trailing
restore block calling fetch_config_options(), which re-derives
forecast_minutes from apps.yaml (2880) rather than putting back the
fixture's overridden value (1440) - a bug in the cleanup itself, not
just a missing one. rate_text_scan restored nothing at all.

Snapshotting and restoring these fields (following the try/finally
pattern already used in test_inverter.py) retires 8 of the 27 known
ordering-dependent pairs tracked on #5079 in one structural change per
file, rather than patching each victim individually:

  load_forecast_history -> model_kernel
  load_forecast_history -> iboost_smart
  load_forecast_history -> model
  load_forecast_history -> optimise_windows_kernel
  rate_text_scan -> cloud_modulation
  rate_text_scan -> optimise_swap_charge
  rate_text_scan -> window_sort
  manual_soc -> cloud_modulation

Verified against all 27 known pairs (not just these 8) via
./run_shuffle, and the full ./run_all --quick suite still passes.
19 pairs remain, tracked on #5079.

Amended per Copilot review on this PR: test_load_forecast_history's
cleanup was still missing several other mutated fixture attributes
(now_utc, midnight_utc, load_minutes, load_minutes_age,
car_charging_threshold, car_charging_rate, base_load,
car_charging_hold, days_previous, days_previous_weight, forecast_days,
holiday_days_left, prefix) - audited the whole function (every
my_predbat.X assignment now has a matching snapshot+restore) rather
than only the fields needed for the 8 pairs above. Doesn't retire any
additional known pairs on its own; it closes latent gaps that could
surface as a future one.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

Author: chalfontchubby

apps/predbat/tests/test_load_forecast_history.py

@@ -83,6 +83,29 @@ def test_load_forecast_history(my_predbat):
     now_utc = datetime(2026, 6, 17, 0, 0, 0, tzinfo=timezone.utc)  # Wednesday
     original_get_holiday_minutes = my_predbat.get_holiday_minutes
     original_args = dict(my_predbat.args) if hasattr(my_predbat, "args") else {}
+    # setup_predbat() below repeatedly overwrites these for each sub-test, and Test 6 calls
+    # fetch_config_options() directly, which re-derives forecast_minutes from apps.yaml
+    # (2880) rather than the fixture's overridden value (1440) - snapshot here so the
+    # fetch_config_options() call in the restore block below can be put back afterwards,
+    # instead of leaking the wrong horizon into every later test in the shared fixture (#5079).
+    original_minutes_now = my_predbat.minutes_now
+    original_forecast_minutes = my_predbat.forecast_minutes
+    original_car_charging_energy = my_predbat.car_charging_energy
+    # setup_predbat() and the sub-tests below also overwrite these; none were being restored
+    # either (Copilot review on #5097).
+    original_now_utc = my_predbat.now_utc
+    original_midnight_utc = my_predbat.midnight_utc
+    original_load_minutes = my_predbat.load_minutes
+    original_load_minutes_age = my_predbat.load_minutes_age
+    original_car_charging_threshold = my_predbat.car_charging_threshold
+    original_car_charging_rate = my_predbat.car_charging_rate
+    original_base_load = my_predbat.base_load
+    original_car_charging_hold = my_predbat.car_charging_hold
+    original_days_previous = my_predbat.days_previous
+    original_days_previous_weight = my_predbat.days_previous_weight
+    original_forecast_days = my_predbat.forecast_days
+    original_holiday_days_left = my_predbat.holiday_days_left
+    original_prefix = my_predbat.prefix
 
     # ---------------------------------------------------------------
     # Test 1: combined weekday + age weighting end-to-end (holiday neutral)
@@ -521,5 +544,21 @@ def fake_get_history_wrapper(entity_id, days=30, required=True, tracked=True):
     my_predbat.args.clear()
     my_predbat.args.update(original_args)
     my_predbat.fetch_config_options()
+    my_predbat.minutes_now = original_minutes_now
+    my_predbat.forecast_minutes = original_forecast_minutes
+    my_predbat.car_charging_energy = original_car_charging_energy
+    my_predbat.now_utc = original_now_utc
+    my_predbat.midnight_utc = original_midnight_utc
+    my_predbat.load_minutes = original_load_minutes
+    my_predbat.load_minutes_age = original_load_minutes_age
+    my_predbat.car_charging_threshold = original_car_charging_threshold
+    my_predbat.car_charging_rate = original_car_charging_rate
+    my_predbat.base_load = original_base_load
+    my_predbat.car_charging_hold = original_car_charging_hold
+    my_predbat.days_previous = original_days_previous
+    my_predbat.days_previous_weight = original_days_previous_weight
+    my_predbat.forecast_days = original_forecast_days
+    my_predbat.holiday_days_left = original_holiday_days_left
+    my_predbat.prefix = original_prefix
 
     return failed

apps/predbat/tests/test_rate_text_scan.py

@@ -18,38 +18,56 @@ def test_rate_text_scan(my_predbat):
     failed = False
     print("**** Testing rate_text_scan ****")
 
-    my_predbat.minutes_now = 0
-    my_predbat.end_record = 9
-    my_predbat.forecast_minutes = 9
-    my_predbat.rate_min = 4.0
-    my_predbat.rate_max = 43.09
-
-    # Band A (cheap, minutes 0-2): varies 4.0/10.0/6.0
-    # Band B (expensive, minutes 3-5): varies 20.0/28.7/22.0
-    # Band C (very expensive, minutes 6-8): flat 43.1
-    my_predbat.rate_import = {
-        0: 4.0,
-        1: 10.0,
-        2: 6.0,
-        3: 20.0,
-        4: 28.7,
-        5: 22.0,
-        6: 43.1,
-        7: 43.1,
-        8: 43.1,
-    }
-
-    result = my_predbat.rate_text_scan(export=False)
-
-    expected = [
-        {"start": 0, "end": 3, "rate": "cheap", "range": "(4.0p - 10.0p)"},
-        {"start": 3, "end": 6, "rate": "expensive", "range": "(20.0p - 28.7p)"},
-        {"start": 6, "end": 9, "rate": "very expensive", "range": "(43.1p)"},
-    ]
-
-    if result != expected:
-        print(f"  ERROR: rate_text_scan mismatch\n  got:      {result}\n  expected: {expected}")
-        failed = True
+    # Snapshot every field this test overwrites below and restore it in finally - none of
+    # this was being restored, so it leaked a shrunk 9-minute horizon and a tiny synthetic
+    # rate table into every later test sharing this fixture (#5079).
+    original_minutes_now = my_predbat.minutes_now
+    original_end_record = my_predbat.end_record
+    original_forecast_minutes = my_predbat.forecast_minutes
+    original_rate_min = my_predbat.rate_min
+    original_rate_max = my_predbat.rate_max
+    original_rate_import = my_predbat.rate_import
+
+    try:
+        my_predbat.minutes_now = 0
+        my_predbat.end_record = 9
+        my_predbat.forecast_minutes = 9
+        my_predbat.rate_min = 4.0
+        my_predbat.rate_max = 43.09
+
+        # Band A (cheap, minutes 0-2): varies 4.0/10.0/6.0
+        # Band B (expensive, minutes 3-5): varies 20.0/28.7/22.0
+        # Band C (very expensive, minutes 6-8): flat 43.1
+        my_predbat.rate_import = {
+            0: 4.0,
+            1: 10.0,
+            2: 6.0,
+            3: 20.0,
+            4: 28.7,
+            5: 22.0,
+            6: 43.1,
+            7: 43.1,
+            8: 43.1,
+        }
+
+        result = my_predbat.rate_text_scan(export=False)
+
+        expected = [
+            {"start": 0, "end": 3, "rate": "cheap", "range": "(4.0p - 10.0p)"},
+            {"start": 3, "end": 6, "rate": "expensive", "range": "(20.0p - 28.7p)"},
+            {"start": 6, "end": 9, "rate": "very expensive", "range": "(43.1p)"},
+        ]
+
+        if result != expected:
+            print(f"  ERROR: rate_text_scan mismatch\n  got:      {result}\n  expected: {expected}")
+            failed = True
+    finally:
+        my_predbat.minutes_now = original_minutes_now
+        my_predbat.end_record = original_end_record
+        my_predbat.forecast_minutes = original_forecast_minutes
+        my_predbat.rate_min = original_rate_min
+        my_predbat.rate_max = original_rate_max
+        my_predbat.rate_import = original_rate_import
 
     print("**** rate_text_scan tests completed ****")
     return failed