Replace swap_attribute with patch.object

Author: puddly

tests/application/test_connect.py

@@ -1,12 +1,13 @@
 import asyncio
+from unittest.mock import patch
 
 import pytest
 
 import zigpy_znp.config as conf
 from zigpy_znp.uart import connect as uart_connect
 from zigpy_znp.zigbee.application import ControllerApplication
 
-from ..conftest import FORMED_DEVICES, FormedLaunchpadCC26X2R1, swap_attribute
+from ..conftest import FORMED_DEVICES, FormedLaunchpadCC26X2R1
 
 
 async def test_no_double_connect(make_znp_server, mocker):
@@ -118,7 +119,7 @@ async def test_reconnect(device, event_loop, make_application):
     assert app._znp is not None
 
     # Don't reply to anything for a bit
-    with swap_attribute(znp_server, "frame_received", lambda _: None):
+    with patch.object(znp_server, "frame_received", lambda _: None):
         # Now that we're connected, have the server close the connection
         znp_server._uart._transport.close()
 
@@ -197,7 +198,7 @@ async def test_reconnect_lockup(device, event_loop, make_application, mocker):
     await app.startup(auto_form=False)
 
     # Stop responding
-    with swap_attribute(znp_server, "frame_received", lambda _: None):
+    with patch.object(znp_server, "frame_received", lambda _: None):
         assert app._znp is not None
         assert app._reconnect_task.done()
 
@@ -250,7 +251,7 @@ async def patched_load_network_info(old_load=app.load_network_info, **kwargs):
         finally:
             did_load_info.set_result(True)
 
-    with swap_attribute(app, "load_network_info", patched_load_network_info):
+    with patch.object(app, "load_network_info", patched_load_network_info):
         # "Drop" the connection like PySerial
         app._znp._uart.connection_lost(exc=None)
 

tests/conftest.py

@@ -3,8 +3,7 @@
 import inspect
 import logging
 import pathlib
-import contextlib
-from unittest.mock import Mock, PropertyMock
+from unittest.mock import Mock, PropertyMock, patch
 
 import pytest
 import zigpy.types
@@ -217,17 +216,6 @@ def merge_dicts(a, b):
     return c
 
 
-@contextlib.contextmanager
-def swap_attribute(obj, name, value):
-    old_value = getattr(obj, name)
-    setattr(obj, name, value)
-
-    try:
-        yield old_value
-    finally:
-        setattr(obj, name, old_value)
-
-
 @pytest.fixture
 def make_application(make_znp_server):
     async def inner(
@@ -363,7 +351,7 @@ def send(self, response):
 
     def close(self):
         # We don't clear listeners on shutdown
-        with swap_attribute(self, "_listeners", {}):
+        with patch.object(self, "_listeners", {}):
             return super().close()