From 164b9782c3dce1820c9a89a0edf26f1f3d883e9e Mon Sep 17 00:00:00 2001
From: Bas Nijholt <bas@nijho.lt>
Date: Sat, 29 Jul 2023 21:20:42 -0700
Subject: [PATCH] Fix tests

---
 custom_components/adaptive_lighting/switch.py | 27 +++++++++++--------
 tests/test_switch.py                          |  1 -
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/custom_components/adaptive_lighting/switch.py b/custom_components/adaptive_lighting/switch.py
index 92c30d25..34b46761 100644
--- a/custom_components/adaptive_lighting/switch.py
+++ b/custom_components/adaptive_lighting/switch.py
@@ -2000,6 +2000,7 @@ class AdaptiveLightingManager:
         # Don't adapt our own service calls
         if is_our_context(call.context):
             return
+        data_copy = data.copy()
         _LOGGER.debug(
             "_service_interceptor_turn_on_handler: call='%s', data='%s'",
             call,
@@ -2054,8 +2055,10 @@ class AdaptiveLightingManager:
                     skipped.append(entity_id)
                 else:
                     filtered_entity_ids.append(entity_id)
+
             if not filtered_entity_ids:
                 continue
+
             transition = data[CONF_PARAMS].get(
                 ATTR_TRANSITION,
                 switch.initial_transition,
@@ -2066,29 +2069,30 @@ class AdaptiveLightingManager:
                     switch=switch,
                     transition=transition,
                     call=call,
-                    data=modify_service_data(data.copy(), filtered_entity_ids),
+                    data=modify_service_data(data, filtered_entity_ids),
                 )
                 has_intercepted = True
                 continue
-            await switch._update_attrs_and_maybe_adapt_lights(
-                context=switch.create_context("intercept", call.context),
-                lights=filtered_entity_ids,
-                transition=transition,
-                force=True,
-            )
+
+            for eid in filtered_entity_ids:
+                await switch._adapt_light(
+                    light=eid,
+                    # Must add a new context otherwise _adapt_light will bail out
+                    context=switch.create_context("intercept"),
+                    transition=transition,
+                )
 
         if skipped:
             if not has_intercepted:
+                modify_service_data(data, skipped)
                 return  # The call will be intercepted with the original data
-            # Modify the service data inplace
-            modify_service_data(data, skipped)
             # Call light turn_on service for skipped entities
             _LOGGER.debug(
                 "_service_interceptor_turn_on_handler: calling `light.turn_on` with skipped='%s', data: '%s'",
                 skipped,
                 data,
             )
-            service_data = data.copy()
+            service_data = modify_service_data(data_copy, skipped)
             service_data.update(service_data.pop(CONF_PARAMS, {}))
             service_data.pop(ATTR_COLOR_TEMP, None)
             await self.hass.services.async_call(
@@ -2096,7 +2100,8 @@ class AdaptiveLightingManager:
                 SERVICE_TURN_ON,
                 service_data,
                 blocking=True,
-                context=call.context,
+                # Must add a new context to avoid infinite recursion
+                context=switch.create_context("skipped"),
             )
 
     async def _service_interceptor_turn_on_single_light_handler(
diff --git a/tests/test_switch.py b/tests/test_switch.py
index d6ba8689..47abcdfc 100644
--- a/tests/test_switch.py
+++ b/tests/test_switch.py
@@ -1615,7 +1615,6 @@ async def test_proactive_multiple_lights(hass):
     assert hass.states.get(lights[0]).state == STATE_ON, lights[0]
     assert hass.states.get(lights[1]).state == STATE_ON, lights[1]
     assert hass.states.get(lights[2]).state == STATE_ON, lights[2]
-    assert 0
 
 
 async def test_two_switches_for_single_light(hass):