Speedtestdotnet code cleanup and type hints (#52533)

tests/components/speedtestdotnet/test_config_flow.py

@@ -1,8 +1,7 @@
 """Tests for SpeedTest config flow."""
 from datetime import timedelta
-from unittest.mock import patch
+from unittest.mock import MagicMock
 
-import pytest
 from speedtest import NoMatchedServers
 
 from homeassistant import config_entries, data_entry_flow
@@ -15,23 +14,12 @@ from homeassistant.components.speedtestdotnet.const import (
     SENSOR_TYPES,
 )
 from homeassistant.const import CONF_MONITORED_CONDITIONS, CONF_SCAN_INTERVAL
-
-from . import MOCK_SERVERS
+from homeassistant.core import HomeAssistant
 
 from tests.common import MockConfigEntry
 
 
-@pytest.fixture(name="mock_setup")
-def mock_setup():
-    """Mock entry setup."""
-    with patch(
-        "homeassistant.components.speedtestdotnet.async_setup_entry",
-        return_value=True,
-    ):
-        yield
-
-
-async def test_flow_works(hass, mock_setup):
+async def test_flow_works(hass: HomeAssistant) -> None:
     """Test user config."""
     result = await hass.config_entries.flow.async_init(
         speedtestdotnet.DOMAIN, context={"source": config_entries.SOURCE_USER}
@@ -43,92 +31,104 @@ async def test_flow_works(hass, mock_setup):
         result["flow_id"], user_input={}
     )
     assert result["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
-    assert result["title"] == "SpeedTest"
 
 
-async def test_import_fails(hass, mock_setup):
+async def test_import_fails(hass: HomeAssistant, mock_api: MagicMock) -> None:
     """Test import step fails if server_id is not valid."""
 
-    with patch("speedtest.Speedtest") as mock_api:
-        mock_api.return_value.get_servers.side_effect = NoMatchedServers
-        result = await hass.config_entries.flow.async_init(
-            speedtestdotnet.DOMAIN,
-            context={"source": config_entries.SOURCE_IMPORT},
-            data={
-                CONF_SERVER_ID: "223",
-                CONF_MANUAL: True,
-                CONF_SCAN_INTERVAL: timedelta(minutes=1),
-                CONF_MONITORED_CONDITIONS: list(SENSOR_TYPES),
-            },
-        )
-        assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT
-        assert result["reason"] == "wrong_server_id"
+    mock_api.return_value.get_servers.side_effect = NoMatchedServers
+    result = await hass.config_entries.flow.async_init(
+        speedtestdotnet.DOMAIN,
+        context={"source": config_entries.SOURCE_IMPORT},
+        data={
+            CONF_SERVER_ID: "223",
+            CONF_MANUAL: True,
+            CONF_SCAN_INTERVAL: timedelta(minutes=1),
+            CONF_MONITORED_CONDITIONS: list(SENSOR_TYPES),
+        },
+    )
+    assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT
+    assert result["reason"] == "wrong_server_id"
 
 
-async def test_import_success(hass, mock_setup):
+async def test_import_success(hass):
     """Test import step is successful if server_id is valid."""
 
-    with patch("speedtest.Speedtest"):
-        result = await hass.config_entries.flow.async_init(
-            speedtestdotnet.DOMAIN,
-            context={"source": config_entries.SOURCE_IMPORT},
-            data={
-                CONF_SERVER_ID: "1",
-                CONF_MANUAL: True,
-                CONF_SCAN_INTERVAL: timedelta(minutes=1),
-                CONF_MONITORED_CONDITIONS: list(SENSOR_TYPES),
-            },
-        )
+    result = await hass.config_entries.flow.async_init(
+        speedtestdotnet.DOMAIN,
+        context={"source": config_entries.SOURCE_IMPORT},
+        data={
+            CONF_SERVER_ID: "1",
+            CONF_MANUAL: True,
+            CONF_SCAN_INTERVAL: timedelta(minutes=1),
+            CONF_MONITORED_CONDITIONS: list(SENSOR_TYPES),
+        },
+    )
 
-        assert result["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
-        assert result["title"] == "SpeedTest"
-        assert result["data"][CONF_SERVER_ID] == "1"
-        assert result["data"][CONF_MANUAL] is True
-        assert result["data"][CONF_SCAN_INTERVAL] == 1
+    assert result["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
+    assert result["title"] == "SpeedTest"
+    assert result["data"][CONF_SERVER_ID] == "1"
+    assert result["data"][CONF_MANUAL] is True
+    assert result["data"][CONF_SCAN_INTERVAL] == 1
 
 
-async def test_options(hass):
+async def test_options(hass: HomeAssistant, mock_api: MagicMock) -> None:
     """Test updating options."""
     entry = MockConfigEntry(
         domain=DOMAIN,
         title="SpeedTest",
-        data={},
-        options={},
     )
     entry.add_to_hass(hass)
 
-    with patch("speedtest.Speedtest") as mock_api:
-        mock_api.return_value.get_servers.return_value = MOCK_SERVERS
-        await hass.config_entries.async_setup(entry.entry_id)
+    await hass.config_entries.async_setup(entry.entry_id)
+    await hass.async_block_till_done()
 
-        result = await hass.config_entries.options.async_init(entry.entry_id)
-        assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
-        assert result["step_id"] == "init"
+    result = await hass.config_entries.options.async_init(entry.entry_id)
+    assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
+    assert result["step_id"] == "init"
 
-        result = await hass.config_entries.options.async_configure(
-            result["flow_id"],
-            user_input={
-                CONF_SERVER_NAME: "Country1 - Sponsor1 - Server1",
-                CONF_SCAN_INTERVAL: 30,
-                CONF_MANUAL: False,
-            },
-        )
-
-        assert result["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
-        assert result["data"] == {
+    result = await hass.config_entries.options.async_configure(
+        result["flow_id"],
+        user_input={
+            CONF_SERVER_NAME: "Country1 - Sponsor1 - Server1",
+            CONF_SCAN_INTERVAL: 30,
+            CONF_MANUAL: True,
+        },
+    )
+
+    assert result["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
+    assert result["data"] == {
+        CONF_SERVER_NAME: "Country1 - Sponsor1 - Server1",
+        CONF_SERVER_ID: "1",
+        CONF_SCAN_INTERVAL: 30,
+        CONF_MANUAL: True,
+    }
+    await hass.async_block_till_done()
+
+    assert hass.data[DOMAIN].update_interval is None
+
+    # test setting the option to update periodically
+    result2 = await hass.config_entries.options.async_init(entry.entry_id)
+    assert result2["type"] == data_entry_flow.RESULT_TYPE_FORM
+    assert result2["step_id"] == "init"
+
+    result2 = await hass.config_entries.options.async_configure(
+        result2["flow_id"],
+        user_input={
             CONF_SERVER_NAME: "Country1 - Sponsor1 - Server1",
-            CONF_SERVER_ID: "1",
             CONF_SCAN_INTERVAL: 30,
             CONF_MANUAL: False,
-        }
+        },
+    )
+    await hass.async_block_till_done()
+
+    assert hass.data[DOMAIN].update_interval == timedelta(minutes=30)
 
 
-async def test_integration_already_configured(hass):
+async def test_integration_already_configured(hass: HomeAssistant) -> None:
     """Test integration is already configured."""
     entry = MockConfigEntry(
         domain=DOMAIN,
-        data={},
-        options={},
     )
     entry.add_to_hass(hass)
     result = await hass.config_entries.flow.async_init(