Replace all per-test timeouts with a global 10s timeout

Author: puddly

setup.cfg

@@ -30,4 +30,5 @@ combine_as_imports = true
 
 [tool:pytest]
 addopts = --showlocals --verbose
-testpaths = tests
+testpaths = tests
+timeout=10

tests/api/test_connect.py

@@ -6,7 +6,7 @@
 
 from ..conftest import FAKE_SERIAL_PORT, BaseServerZNP, config_for_port_path
 
-pytestmark = [pytest.mark.timeout(1), pytest.mark.asyncio]
+pytestmark = [pytest.mark.asyncio]
 
 
 async def test_connect_no_communication(connected_znp):

tests/api/test_listeners.py

@@ -7,7 +7,7 @@
 import zigpy_znp.commands as c
 from zigpy_znp.api import OneShotResponseListener, CallbackResponseListener
 
-pytestmark = [pytest.mark.timeout(1), pytest.mark.asyncio]
+pytestmark = [pytest.mark.asyncio]
 
 
 async def test_resolve(event_loop, mocker):

tests/api/test_nvram.py

@@ -4,7 +4,7 @@
 import zigpy_znp.commands as c
 from zigpy_znp.types import nvids
 
-pytestmark = [pytest.mark.timeout(1), pytest.mark.asyncio]
+pytestmark = [pytest.mark.asyncio]
 
 
 async def test_wrong_order(connected_znp, event_loop):

tests/api/test_request.py

@@ -8,7 +8,7 @@
 import zigpy_znp.commands as c
 from zigpy_znp.exceptions import CommandNotRecognized, InvalidCommandResponse
 
-pytestmark = [pytest.mark.timeout(1), pytest.mark.asyncio]
+pytestmark = [pytest.mark.asyncio]
 
 
 async def test_callback_rsp(connected_znp, event_loop):

tests/api/test_response.py

@@ -7,7 +7,7 @@
 import zigpy_znp.commands as c
 from zigpy_znp.api import _deduplicate_commands
 
-pytestmark = [pytest.mark.timeout(1), pytest.mark.asyncio]
+pytestmark = [pytest.mark.asyncio]
 
 
 async def test_responses(connected_znp):

tests/application/test_connect.py

@@ -8,7 +8,7 @@
 
 from ..conftest import FORMED_DEVICES, FormedLaunchpadCC26X2R1, swap_attribute
 
-pytestmark = [pytest.mark.timeout(1), pytest.mark.asyncio]
+pytestmark = [pytest.mark.asyncio]
 
 
 @pytest.mark.xfail(raises=AssertionError)
@@ -81,7 +81,6 @@ async def test_probe_multiple(device, make_znp_server):
     assert await ControllerApplication.probe(config)
 
 
-@pytest.mark.timeout(5)
 @pytest.mark.parametrize("device", FORMED_DEVICES)
 async def test_reconnect(device, event_loop, make_application):
     app, znp_server = make_application(

tests/application/test_joining.py

@@ -12,7 +12,7 @@
 
 from ..conftest import FORMED_DEVICES, FORMED_ZSTACK3_DEVICES
 
-pytestmark = [pytest.mark.timeout(1), pytest.mark.asyncio]
+pytestmark = [pytest.mark.asyncio]
 
 
 @pytest.mark.parametrize("device", FORMED_DEVICES)
@@ -79,7 +79,6 @@ async def test_permit_join_failure(device, make_application):
     await app.shutdown()
 
 
-@pytest.mark.timeout(2)
 @pytest.mark.parametrize("device", FORMED_ZSTACK3_DEVICES)
 @pytest.mark.parametrize("status", [t.Status.SUCCESS, t.Status.MAC_MEM_ERROR])
 async def test_permit_join_with_key(device, status, make_application):

tests/application/test_requests.py

@@ -10,7 +10,7 @@
 
 from ..conftest import FORMED_DEVICES, CoroutineMock
 
-pytestmark = [pytest.mark.timeout(1), pytest.mark.asyncio]
+pytestmark = [pytest.mark.asyncio]
 
 
 @pytest.mark.parametrize("device", FORMED_DEVICES)
@@ -263,7 +263,6 @@ async def test_mrequest(device, make_application, mocker):
 
 
 @pytest.mark.parametrize("device", FORMED_DEVICES)
-@pytest.mark.timeout(10)
 async def test_request_concurrency(device, make_application, mocker):
     app, znp_server = make_application(
         server_cls=device, client_config={conf.CONF_MAX_CONCURRENT_REQUESTS: 2}

tests/application/test_startup.py

@@ -16,7 +16,7 @@
     FormedLaunchpadCC26X2R1,
 )
 
-pytestmark = [pytest.mark.timeout(1), pytest.mark.asyncio]
+pytestmark = [pytest.mark.asyncio]
 
 
 @pytest.mark.parametrize(

tests/application/test_update_network.py

@@ -5,7 +5,7 @@
 
 from ..conftest import FORMED_DEVICES, CoroutineMock
 
-pytestmark = [pytest.mark.timeout(1), pytest.mark.asyncio]
+pytestmark = [pytest.mark.asyncio]
 
 
 @pytest.mark.parametrize("device", FORMED_DEVICES)

tests/application/test_zigpy_callbacks.py

@@ -8,7 +8,7 @@
 
 from ..conftest import FORMED_DEVICES
 
-pytestmark = [pytest.mark.timeout(1), pytest.mark.asyncio]
+pytestmark = [pytest.mark.asyncio]
 
 
 @pytest.mark.parametrize("device", FORMED_DEVICES)

tests/test_uart.py

@@ -221,7 +221,6 @@ def test_uart_frame_received_error(connected_uart, mocker):
     znp.frame_received.call_count == 3
 
 
-@pytest.mark.timeout(1)
 @pytest.mark.asyncio
 async def test_connect_auto(dummy_serial_conn, mocker):
     device, _ = dummy_serial_conn
@@ -234,7 +233,6 @@ async def test_connect_auto(dummy_serial_conn, mocker):
     )
 
 
-@pytest.mark.timeout(1)
 @pytest.mark.asyncio
 async def test_connection_lost(dummy_serial_conn, mocker, event_loop):
     device, _ = dummy_serial_conn
@@ -266,7 +264,6 @@ async def test_connection_lost(dummy_serial_conn, mocker, event_loop):
     assert (await conn_closed_fut) is None
 
 
-@pytest.mark.timeout(1)
 @pytest.mark.asyncio
 async def test_connection_made(dummy_serial_conn, mocker):
     device, _ = dummy_serial_conn
@@ -279,7 +276,6 @@ async def test_connection_made(dummy_serial_conn, mocker):
     znp.connection_made.assert_called_once_with()
 
 
-@pytest.mark.timeout(1)
 @pytest.mark.asyncio
 async def test_no_toggle_rts(dummy_serial_conn, mocker):
     device, serial = dummy_serial_conn
@@ -297,7 +293,6 @@ async def test_no_toggle_rts(dummy_serial_conn, mocker):
     assert rts.mock_calls == []
 
 
-@pytest.mark.timeout(1)
 @pytest.mark.asyncio
 async def test_toggle_rts(dummy_serial_conn, mocker):
     device, serial = dummy_serial_conn

tests/tools/test_energy_scan.py

@@ -19,7 +19,6 @@ def channel_list(channels):
     assert channel_list(t.Channels.CHANNEL_15) == [15]
 
 
-@pytest.mark.timeout(1)
 @pytest.mark.asyncio
 @pytest.mark.parametrize("device", FORMED_DEVICES)
 async def test_energy_scan(device, make_znp_server, capsys):

tests/tools/test_flash.py

@@ -9,7 +9,7 @@
 
 from ..conftest import BaseServerZNP, CoroutineMock
 
-pytestmark = [pytest.mark.timeout(1), pytest.mark.asyncio]
+pytestmark = [pytest.mark.asyncio]
 
 
 random.seed(12345)

tests/tools/test_network_scan.py

@@ -8,7 +8,7 @@
 
 from ..conftest import FormedLaunchpadCC26X2R1
 
-pytestmark = [pytest.mark.timeout(1), pytest.mark.asyncio]
+pytestmark = [pytest.mark.asyncio]
 
 
 @pytest.mark.parametrize("device", [FormedLaunchpadCC26X2R1])

tests/tools/test_nvram.py

@@ -11,7 +11,7 @@
 
 from ..conftest import ALL_DEVICES
 
-pytestmark = [pytest.mark.timeout(3), pytest.mark.asyncio]
+pytestmark = [pytest.mark.asyncio]
 
 
 def not_recognized(req):
@@ -54,7 +54,6 @@ async def test_nvram_read(device, make_znp_server, tmp_path, mocker):
     znp_server.close()
 
 
-@pytest.mark.timeout(5)
 @pytest.mark.parametrize("device", ALL_DEVICES)
 async def test_nvram_write(device, make_znp_server, tmp_path, mocker):
     znp_server = make_znp_server(server_cls=device)