Refactor EvohomeFactory to module level, align defaults, drop redundant evohome_client teardown

Author: lexbrugman

tests/conftest.py

@@ -53,7 +53,7 @@ class FakeZone:
     active_faults: list = field(default_factory=list)
     mode: ZoneMode = ZoneMode.FOLLOW_SCHEDULE
     temperature_status: dict = field(default_factory=lambda: {"temperature": 19})
-    setpoint_status: dict = field(default_factory=lambda: {"setpoint_mode": "FollowSchedule", "target_heat_temperature": 20})
+    setpoint_status: dict = field(default_factory=lambda: {"setpoint_mode": "FollowSchedule", "target_heat_temperature": 21})
     schedule: list = field(default_factory=_uniform_schedule)
 
 
@@ -104,63 +104,63 @@ class State(NamedTuple):
     zone: FakeZone
 
 
+class EvohomeFactory:
+    @staticmethod
+    def zone(**kwargs):
+        return FakeZone(**kwargs)
+
+    @staticmethod
+    def control_system(mode=SystemMode.AUTO, zones=None, system_id="system-1"):
+        return FakeControlSystem(mode=mode, zones=zones or [], id=system_id)
+
+    @staticmethod
+    def location(*, name="Home", control_systems=None):
+        gateway = FakeGateway(systems=control_systems or [])
+        return FakeLocation(name=name, gateways=[gateway])
+
+    @staticmethod
+    def switchpoint(time_of_day, heat_setpoint):
+        return _make_switchpoint(time_of_day, heat_setpoint)
+
+    @staticmethod
+    def day_schedule(day_of_week_int, switchpoints):
+        return _make_day_schedule(day_of_week_int, switchpoints)
+
+    @staticmethod
+    def uniform_schedule(setpoint=20.0, time_of_day="07:00:00"):
+        return _uniform_schedule(setpoint, time_of_day)
+
+    @staticmethod
+    def complete_state(*, location_name="Home", zone_mode=ZoneMode.FOLLOW_SCHEDULE, system_mode=SystemMode.AUTO, with_fault=False, setpoint=21, schedule=None):
+        zone = EvohomeFactory.zone(
+            name="Living",
+            mode=zone_mode,
+            setpoint_status={"setpoint_mode": zone_mode, "target_heat_temperature": setpoint},
+            temperature_status={"temperature": 20},
+            active_faults=["fault"] if with_fault else [],
+            schedule=schedule if schedule is not None else EvohomeFactory.uniform_schedule(setpoint=float(setpoint)),
+        )
+        control = EvohomeFactory.control_system(mode=system_mode, zones=[zone])
+        location = EvohomeFactory.location(name=location_name, control_systems=[control])
+        return State(location=location, control_system=control, zone=zone)
+
+
 @pytest.fixture
 def evohome_factory():
-    class Factory:
-        @staticmethod
-        def zone(**kwargs):
-            return FakeZone(**kwargs)
-
-        @staticmethod
-        def control_system(mode=SystemMode.AUTO, zones=None, system_id="system-1"):
-            return FakeControlSystem(mode=mode, zones=zones or [], id=system_id)
-
-        @staticmethod
-        def location(*, name="Home", control_systems=None):
-            gateway = FakeGateway(systems=control_systems or [])
-            return FakeLocation(name=name, gateways=[gateway])
-
-        @staticmethod
-        def switchpoint(time_of_day, heat_setpoint):
-            return _make_switchpoint(time_of_day, heat_setpoint)
-
-        @staticmethod
-        def day_schedule(day_of_week_int, switchpoints):
-            return _make_day_schedule(day_of_week_int, switchpoints)
-
-        @staticmethod
-        def uniform_schedule(setpoint=20.0, time_of_day="07:00:00"):
-            return _uniform_schedule(setpoint, time_of_day)
-
-        @staticmethod
-        def complete_state(*, location_name="Home", zone_mode=ZoneMode.FOLLOW_SCHEDULE, system_mode=SystemMode.AUTO, with_fault=False, setpoint=21, schedule=None):
-            zone = FakeZone(
-                name="Living",
-                mode=zone_mode,
-                setpoint_status={"setpoint_mode": zone_mode, "target_heat_temperature": setpoint},
-                temperature_status={"temperature": 20},
-                active_faults=["fault"] if with_fault else [],
-                schedule=schedule if schedule is not None else Factory.uniform_schedule(setpoint=float(setpoint)),
-            )
-            control = FakeControlSystem(mode=system_mode, zones=[zone], id="sys-1")
-            location = FakeLocation(name=location_name, gateways=[FakeGateway(systems=[control])])
-            return State(location=location, control_system=control, zone=zone)
-
-    return Factory
+    return EvohomeFactory
 
 
 @pytest.fixture
-def evohome_client(evohome_factory):
+def evohome_client():
     from evohome_helper import evohome
 
     def _build(*, location_name="Home", **state_kwargs):
-        state = evohome_factory.complete_state(location_name=location_name, **state_kwargs)
+        state = EvohomeFactory.complete_state(location_name=location_name, **state_kwargs)
         client = FakeEvohomeClient(locations=[state.location])
         evohome._evohome_client = client
         return state
 
-    yield _build
-    evohome._evohome_client = None
+    return _build
 
 
 @pytest.fixture(autouse=True)