Split simple and recovery in onewire config-flow user tests (#135102)

homeassistant/components/onewire/quality_scale.yaml

@@ -11,7 +11,6 @@ rules:
     status: todo
     comment: >
       Let's have test_user_options_empty_selection end in CREATE_ENTRY
-      Split the happy flow and the not happy flow in test_user_flow
   runtime-data: done
   test-before-setup: done
   appropriate-polling: done

tests/components/onewire/test_config_flow.py

@@ -39,13 +39,31 @@ async def filled_device_registry(
     return device_registry
 
 
-async def test_user_flow(hass: HomeAssistant, mock_setup_entry: AsyncMock) -> None:
+async def test_user_flow(hass: HomeAssistant) -> None:
     """Test user flow."""
     result = await hass.config_entries.flow.async_init(
         DOMAIN, context={"source": SOURCE_USER}
     )
-    assert result["type"] is FlowResultType.FORM
+
-    assert not result["errors"]
+    with patch(
+        "homeassistant.components.onewire.onewirehub.protocol.proxy",
+    ):
+        result = await hass.config_entries.flow.async_configure(
+            result["flow_id"],
+            user_input={CONF_HOST: "1.2.3.4", CONF_PORT: 1234},
+        )
+
+    assert result["type"] is FlowResultType.CREATE_ENTRY
+    new_entry = result["result"]
+    assert new_entry.title == "1.2.3.4"
+    assert new_entry.data == {CONF_HOST: "1.2.3.4", CONF_PORT: 1234}
+
+
+async def test_user_flow_recovery(hass: HomeAssistant) -> None:
+    """Test user flow recovery after invalid server."""
+    result = await hass.config_entries.flow.async_init(
+        DOMAIN, context={"source": SOURCE_USER}
+    )
 
     # Invalid server
     with patch(
@@ -57,9 +75,9 @@ async def test_user_flow(hass: HomeAssistant, mock_setup_entry: AsyncMock) -> No
             user_input={CONF_HOST: "1.2.3.4", CONF_PORT: 1234},
         )
 
-        assert result["type"] is FlowResultType.FORM
+    assert result["type"] is FlowResultType.FORM
-        assert result["step_id"] == "user"
+    assert result["step_id"] == "user"
-        assert result["errors"] == {"base": "cannot_connect"}
+    assert result["errors"] == {"base": "cannot_connect"}
 
     # Valid server
     with patch(
@@ -70,19 +88,14 @@ async def test_user_flow(hass: HomeAssistant, mock_setup_entry: AsyncMock) -> No
             user_input={CONF_HOST: "1.2.3.4", CONF_PORT: 1234},
         )
 
-        assert result["type"] is FlowResultType.CREATE_ENTRY
+    assert result["type"] is FlowResultType.CREATE_ENTRY
-        assert result["title"] == "1.2.3.4"
+    new_entry = result["result"]
-        assert result["data"] == {
+    assert new_entry.title == "1.2.3.4"
-            CONF_HOST: "1.2.3.4",
+    assert new_entry.data == {CONF_HOST: "1.2.3.4", CONF_PORT: 1234}
-            CONF_PORT: 1234,
-        }
-        await hass.async_block_till_done()
-
-    assert len(mock_setup_entry.mock_calls) == 1
 
 
 async def test_user_duplicate(
-    hass: HomeAssistant, config_entry: MockConfigEntry, mock_setup_entry: AsyncMock
+    hass: HomeAssistant, config_entry: MockConfigEntry
 ) -> None:
     """Test user duplicate flow."""
     await hass.config_entries.async_setup(config_entry.entry_id)