From ee0f8309aa424a77236b7778ed195fcc60f09ea0 Mon Sep 17 00:00:00 2001
From: epenet <6771947+epenet@users.noreply.github.com>
Date: Mon, 20 Feb 2023 10:03:11 +0000
Subject: [PATCH 1/4] Adjust mock_setup_entry for config flow

---
 .../scaffold/templates/config_flow/tests/test_config_flow.py | 4 ++--
 .../templates/config_flow_helper/tests/test_config_flow.py   | 4 ++--
 tests/components/nibe_heatpump/test_config_flow.py           | 4 ++--
 tests/components/onewire/test_config_flow.py                 | 4 ++--
 tests/components/philips_js/test_config_flow.py              | 4 ++--
 tests/components/renault/test_config_flow.py                 | 5 +++--
 tests/components/samsungtv/test_config_flow.py               | 4 ++--
 tests/components/sfr_box/test_config_flow.py                 | 4 ++--
 tests/components/sleepiq/test_config_flow.py                 | 4 ++--
 9 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/script/scaffold/templates/config_flow/tests/test_config_flow.py b/script/scaffold/templates/config_flow/tests/test_config_flow.py
index 6af4bf1e6675c9..d6806d40a8a3c5 100644
--- a/script/scaffold/templates/config_flow/tests/test_config_flow.py
+++ b/script/scaffold/templates/config_flow/tests/test_config_flow.py
@@ -11,8 +11,8 @@
 from homeassistant.data_entry_flow import FlowResultType
 
 
-@pytest.fixture(autouse=True, name="mock_setup_entry")
-def override_async_setup_entry() -> Generator[AsyncMock, None, None]:
+@pytest.fixture(autouse=True)
+def mock_setup_entry() -> Generator[AsyncMock, None, None]:
     """Override async_setup_entry."""
     with patch(
         "homeassistant.components.NEW_DOMAIN.async_setup_entry", return_value=True
diff --git a/script/scaffold/templates/config_flow_helper/tests/test_config_flow.py b/script/scaffold/templates/config_flow_helper/tests/test_config_flow.py
index ba7efff5b6c61c..c924ed02b6e1f6 100644
--- a/script/scaffold/templates/config_flow_helper/tests/test_config_flow.py
+++ b/script/scaffold/templates/config_flow_helper/tests/test_config_flow.py
@@ -12,8 +12,8 @@
 from tests.common import MockConfigEntry
 
 
-@pytest.fixture(autouse=True, name="mock_setup_entry")
-def override_async_setup_entry() -> Generator[AsyncMock, None, None]:
+@pytest.fixture(autouse=True)
+def mock_setup_entry() -> Generator[AsyncMock, None, None]:
     """Override async_setup_entry."""
     with patch(
         "homeassistant.components.NEW_DOMAIN.async_setup_entry", return_value=True
diff --git a/tests/components/nibe_heatpump/test_config_flow.py b/tests/components/nibe_heatpump/test_config_flow.py
index 9263919214d3a4..1457068876f231 100644
--- a/tests/components/nibe_heatpump/test_config_flow.py
+++ b/tests/components/nibe_heatpump/test_config_flow.py
@@ -32,8 +32,8 @@
 }
 
 
-@pytest.fixture(autouse=True, name="mock_setup_entry")
-async def fixture_mock_setup():
+@pytest.fixture(autouse=True)
+async def mock_setup_entry():
     """Make sure we never actually run setup."""
     with patch(
         "homeassistant.components.nibe_heatpump.async_setup_entry", return_value=True
diff --git a/tests/components/onewire/test_config_flow.py b/tests/components/onewire/test_config_flow.py
index eab44bc5d48cd2..caed47cf0977ce 100644
--- a/tests/components/onewire/test_config_flow.py
+++ b/tests/components/onewire/test_config_flow.py
@@ -20,8 +20,8 @@
 from .const import MOCK_OWPROXY_DEVICES
 
 
-@pytest.fixture(autouse=True, name="mock_setup_entry")
-def override_async_setup_entry() -> Generator[AsyncMock, None, None]:
+@pytest.fixture(autouse=True)
+def mock_setup_entry() -> Generator[AsyncMock, None, None]:
     """Override async_setup_entry."""
     with patch(
         "homeassistant.components.onewire.async_setup_entry", return_value=True
diff --git a/tests/components/philips_js/test_config_flow.py b/tests/components/philips_js/test_config_flow.py
index d4a08aa6886d26..64ed2ee2a49836 100644
--- a/tests/components/philips_js/test_config_flow.py
+++ b/tests/components/philips_js/test_config_flow.py
@@ -20,8 +20,8 @@
 from tests.common import MockConfigEntry
 
 
-@pytest.fixture(autouse=True, name="mock_setup_entry")
-def mock_setup_entry_fixture():
+@pytest.fixture(autouse=True)
+def mock_setup_entry():
     """Disable component setup."""
     with patch(
         "homeassistant.components.philips_js.async_setup_entry", return_value=True
diff --git a/tests/components/renault/test_config_flow.py b/tests/components/renault/test_config_flow.py
index 39d4add062fe06..757b3239a7f1b9 100644
--- a/tests/components/renault/test_config_flow.py
+++ b/tests/components/renault/test_config_flow.py
@@ -1,4 +1,5 @@
 """Test the Renault config flow."""
+from collections.abc import Generator
 from unittest.mock import AsyncMock, PropertyMock, patch
 
 import pytest
@@ -22,8 +23,8 @@
 from tests.common import load_fixture
 
 
-@pytest.fixture(autouse=True, name="mock_setup_entry")
-def override_async_setup_entry() -> AsyncMock:
+@pytest.fixture(autouse=True)
+def mock_setup_entry() -> Generator[AsyncMock, None, None]:
     """Override async_setup_entry."""
     with patch(
         "homeassistant.components.renault.async_setup_entry", return_value=True
diff --git a/tests/components/samsungtv/test_config_flow.py b/tests/components/samsungtv/test_config_flow.py
index e84b3d30cb1ec2..32e9cef9968dc3 100644
--- a/tests/components/samsungtv/test_config_flow.py
+++ b/tests/components/samsungtv/test_config_flow.py
@@ -217,8 +217,8 @@
 }
 
 
-@pytest.fixture(autouse=True, name="mock_setup_entry")
-def override_async_setup_entry() -> Generator[AsyncMock, None, None]:
+@pytest.fixture(autouse=True)
+def mock_setup_entry() -> Generator[AsyncMock, None, None]:
     """Override async_setup_entry."""
     with patch(
         "homeassistant.components.samsungtv.async_setup_entry", return_value=True
diff --git a/tests/components/sfr_box/test_config_flow.py b/tests/components/sfr_box/test_config_flow.py
index e75e5a42c7d6cd..2d8e256de72843 100644
--- a/tests/components/sfr_box/test_config_flow.py
+++ b/tests/components/sfr_box/test_config_flow.py
@@ -16,8 +16,8 @@
 from tests.common import load_fixture
 
 
-@pytest.fixture(autouse=True, name="mock_setup_entry")
-def override_async_setup_entry() -> Generator[AsyncMock, None, None]:
+@pytest.fixture(autouse=True)
+def mock_setup_entry() -> Generator[AsyncMock, None, None]:
     """Override async_setup_entry."""
     with patch(
         "homeassistant.components.sfr_box.async_setup_entry", return_value=True
diff --git a/tests/components/sleepiq/test_config_flow.py b/tests/components/sleepiq/test_config_flow.py
index a2191b56583bdc..f8a0a9bb05d558 100644
--- a/tests/components/sleepiq/test_config_flow.py
+++ b/tests/components/sleepiq/test_config_flow.py
@@ -13,8 +13,8 @@
 from .conftest import SLEEPIQ_CONFIG, setup_platform
 
 
-@pytest.fixture(autouse=True, name="mock_setup_entry")
-def override_async_setup_entry() -> Generator[AsyncMock, None, None]:
+@pytest.fixture(autouse=True)
+def mock_setup_entry() -> Generator[AsyncMock, None, None]:
     """Override async_setup_entry."""
     with patch(
         "homeassistant.components.sleepiq.async_setup_entry", return_value=True

From cbe936d260be3bb99333cde6b0b50a792d8c7054 Mon Sep 17 00:00:00 2001
From: epenet <6771947+epenet@users.noreply.github.com>
Date: Mon, 20 Feb 2023 10:32:34 +0000
Subject: [PATCH 2/4] Move mock_setup_entry to conftest

---
 .../templates/config_flow/tests/conftest.py        | 14 ++++++++++++++
 .../config_flow/tests/test_config_flow.py          | 10 +---------
 .../templates/config_flow_helper/tests/conftest.py | 14 ++++++++++++++
 .../config_flow_helper/tests/test_config_flow.py   | 12 ++----------
 tests/components/nibe_heatpump/conftest.py         | 11 ++++++++++-
 tests/components/nibe_heatpump/test_config_flow.py | 10 ++--------
 tests/components/onewire/conftest.py               | 12 +++++++++++-
 tests/components/onewire/test_config_flow.py       | 10 +---------
 tests/components/philips_js/conftest.py            | 14 +++++++++++++-
 tests/components/philips_js/test_config_flow.py    | 13 ++-----------
 tests/components/renault/conftest.py               | 12 +++++++++++-
 tests/components/renault/test_config_flow.py       | 10 +---------
 tests/components/samsungtv/conftest.py             | 11 ++++++++++-
 tests/components/samsungtv/test_config_flow.py     | 10 +---------
 tests/components/sfr_box/conftest.py               | 11 ++++++++++-
 tests/components/sfr_box/test_config_flow.py       | 10 +---------
 tests/components/sleepiq/conftest.py               | 11 ++++++++++-
 tests/components/sleepiq/test_config_flow.py       | 10 +---------
 18 files changed, 115 insertions(+), 90 deletions(-)
 create mode 100644 script/scaffold/templates/config_flow/tests/conftest.py
 create mode 100644 script/scaffold/templates/config_flow_helper/tests/conftest.py

diff --git a/script/scaffold/templates/config_flow/tests/conftest.py b/script/scaffold/templates/config_flow/tests/conftest.py
new file mode 100644
index 00000000000000..c718121d79d519
--- /dev/null
+++ b/script/scaffold/templates/config_flow/tests/conftest.py
@@ -0,0 +1,14 @@
+"""Test the NEW_NAME config flow."""
+from collections.abc import Generator
+from unittest.mock import AsyncMock, patch
+
+import pytest
+
+
+@pytest.fixture(autouse=True)
+def mock_setup_entry() -> Generator[AsyncMock, None, None]:
+    """Override async_setup_entry."""
+    with patch(
+        "homeassistant.components.NEW_DOMAIN.async_setup_entry", return_value=True
+    ) as mock_setup_entry:
+        yield mock_setup_entry
diff --git a/script/scaffold/templates/config_flow/tests/test_config_flow.py b/script/scaffold/templates/config_flow/tests/test_config_flow.py
index d6806d40a8a3c5..cbc1449378caf9 100644
--- a/script/scaffold/templates/config_flow/tests/test_config_flow.py
+++ b/script/scaffold/templates/config_flow/tests/test_config_flow.py
@@ -1,5 +1,4 @@
 """Test the NEW_NAME config flow."""
-from collections.abc import Generator
 from unittest.mock import AsyncMock, patch
 
 import pytest
@@ -10,14 +9,7 @@
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResultType
 
-
-@pytest.fixture(autouse=True)
-def mock_setup_entry() -> Generator[AsyncMock, None, None]:
-    """Override async_setup_entry."""
-    with patch(
-        "homeassistant.components.NEW_DOMAIN.async_setup_entry", return_value=True
-    ) as mock_setup_entry:
-        yield mock_setup_entry
+pytestmark = pytest.mark.usefixtures("mock_setup_entry")
 
 
 async def test_form(hass: HomeAssistant, mock_setup_entry: AsyncMock) -> None:
diff --git a/script/scaffold/templates/config_flow_helper/tests/conftest.py b/script/scaffold/templates/config_flow_helper/tests/conftest.py
new file mode 100644
index 00000000000000..c718121d79d519
--- /dev/null
+++ b/script/scaffold/templates/config_flow_helper/tests/conftest.py
@@ -0,0 +1,14 @@
+"""Test the NEW_NAME config flow."""
+from collections.abc import Generator
+from unittest.mock import AsyncMock, patch
+
+import pytest
+
+
+@pytest.fixture(autouse=True)
+def mock_setup_entry() -> Generator[AsyncMock, None, None]:
+    """Override async_setup_entry."""
+    with patch(
+        "homeassistant.components.NEW_DOMAIN.async_setup_entry", return_value=True
+    ) as mock_setup_entry:
+        yield mock_setup_entry
diff --git a/script/scaffold/templates/config_flow_helper/tests/test_config_flow.py b/script/scaffold/templates/config_flow_helper/tests/test_config_flow.py
index c924ed02b6e1f6..d21c66797d86fd 100644
--- a/script/scaffold/templates/config_flow_helper/tests/test_config_flow.py
+++ b/script/scaffold/templates/config_flow_helper/tests/test_config_flow.py
@@ -1,6 +1,5 @@
 """Test the NEW_NAME config flow."""
-from collections.abc import Generator
-from unittest.mock import AsyncMock, patch
+from unittest.mock import AsyncMock
 
 import pytest
 
@@ -11,14 +10,7 @@
 
 from tests.common import MockConfigEntry
 
-
-@pytest.fixture(autouse=True)
-def mock_setup_entry() -> Generator[AsyncMock, None, None]:
-    """Override async_setup_entry."""
-    with patch(
-        "homeassistant.components.NEW_DOMAIN.async_setup_entry", return_value=True
-    ) as mock_setup_entry:
-        yield mock_setup_entry
+pytestmark = pytest.mark.usefixtures("mock_setup_entry")
 
 
 @pytest.mark.parametrize("platform", ("sensor",))
diff --git a/tests/components/nibe_heatpump/conftest.py b/tests/components/nibe_heatpump/conftest.py
index 0ae9c73e6b87e8..2b298667063f20 100644
--- a/tests/components/nibe_heatpump/conftest.py
+++ b/tests/components/nibe_heatpump/conftest.py
@@ -1,5 +1,5 @@
 """Test configuration for Nibe Heat Pump."""
-from collections.abc import AsyncIterator, Iterable
+from collections.abc import AsyncIterator, Generator, Iterable
 from contextlib import ExitStack
 from typing import Any
 from unittest.mock import AsyncMock, Mock, patch
@@ -10,6 +10,15 @@
 import pytest
 
 
+@pytest.fixture(autouse=True)
+def mock_setup_entry() -> Generator[AsyncMock, None, None]:
+    """Make sure we never actually run setup."""
+    with patch(
+        "homeassistant.components.nibe_heatpump.async_setup_entry", return_value=True
+    ) as mock_setup_entry:
+        yield mock_setup_entry
+
+
 @pytest.fixture(autouse=True, name="mock_connection_constructor")
 async def fixture_mock_connection_constructor():
     """Make sure we have a dummy connection."""
diff --git a/tests/components/nibe_heatpump/test_config_flow.py b/tests/components/nibe_heatpump/test_config_flow.py
index 1457068876f231..62a6d776cd140f 100644
--- a/tests/components/nibe_heatpump/test_config_flow.py
+++ b/tests/components/nibe_heatpump/test_config_flow.py
@@ -1,5 +1,5 @@
 """Test the Nibe Heat Pump config flow."""
-from unittest.mock import Mock, patch
+from unittest.mock import Mock
 
 from nibe.coil import Coil
 from nibe.exceptions import (
@@ -32,13 +32,7 @@
 }
 
 
-@pytest.fixture(autouse=True)
-async def mock_setup_entry():
-    """Make sure we never actually run setup."""
-    with patch(
-        "homeassistant.components.nibe_heatpump.async_setup_entry", return_value=True
-    ) as mock_setup_entry:
-        yield mock_setup_entry
+pytestmark = pytest.mark.usefixtures("mock_setup_entry")
 
 
 async def _get_connection_form(
diff --git a/tests/components/onewire/conftest.py b/tests/components/onewire/conftest.py
index 9b8b53859ead5a..b0079f6c09c588 100644
--- a/tests/components/onewire/conftest.py
+++ b/tests/components/onewire/conftest.py
@@ -1,5 +1,6 @@
 """Provide common 1-Wire fixtures."""
-from unittest.mock import MagicMock, patch
+from collections.abc import Generator
+from unittest.mock import AsyncMock, MagicMock, patch
 
 from pyownet.protocol import ConnError
 import pytest
@@ -14,6 +15,15 @@
 from tests.common import MockConfigEntry
 
 
+@pytest.fixture(autouse=True)
+def mock_setup_entry() -> Generator[AsyncMock, None, None]:
+    """Override async_setup_entry."""
+    with patch(
+        "homeassistant.components.onewire.async_setup_entry", return_value=True
+    ) as mock_setup_entry:
+        yield mock_setup_entry
+
+
 @pytest.fixture(name="device_id", params=MOCK_OWPROXY_DEVICES.keys())
 def get_device_id(request: pytest.FixtureRequest) -> str:
     """Parametrize device id."""
diff --git a/tests/components/onewire/test_config_flow.py b/tests/components/onewire/test_config_flow.py
index caed47cf0977ce..63e53627e0e265 100644
--- a/tests/components/onewire/test_config_flow.py
+++ b/tests/components/onewire/test_config_flow.py
@@ -1,5 +1,4 @@
 """Tests for 1-Wire config flow."""
-from collections.abc import Generator
 from unittest.mock import AsyncMock, patch
 
 from pyownet import protocol
@@ -19,14 +18,7 @@
 
 from .const import MOCK_OWPROXY_DEVICES
 
-
-@pytest.fixture(autouse=True)
-def mock_setup_entry() -> Generator[AsyncMock, None, None]:
-    """Override async_setup_entry."""
-    with patch(
-        "homeassistant.components.onewire.async_setup_entry", return_value=True
-    ) as mock_setup_entry:
-        yield mock_setup_entry
+pytestmark = pytest.mark.usefixtures("mock_setup_entry")
 
 
 @pytest.fixture
diff --git a/tests/components/philips_js/conftest.py b/tests/components/philips_js/conftest.py
index 0aaa76001c1c22..898f007088a073 100644
--- a/tests/components/philips_js/conftest.py
+++ b/tests/components/philips_js/conftest.py
@@ -1,5 +1,6 @@
 """Standard setup for tests."""
-from unittest.mock import create_autospec, patch
+from collections.abc import Generator
+from unittest.mock import AsyncMock, create_autospec, patch
 
 from haphilipsjs import PhilipsTV
 import pytest
@@ -11,6 +12,17 @@
 from tests.common import MockConfigEntry, mock_device_registry
 
 
+@pytest.fixture(autouse=True)
+def mock_setup_entry() -> Generator[AsyncMock, None, None]:
+    """Disable component setup."""
+    with patch(
+        "homeassistant.components.philips_js.async_setup_entry", return_value=True
+    ) as mock_setup_entry, patch(
+        "homeassistant.components.philips_js.async_unload_entry", return_value=True
+    ):
+        yield mock_setup_entry
+
+
 @pytest.fixture(autouse=True)
 async def setup_notification(hass):
     """Configure notification system."""
diff --git a/tests/components/philips_js/test_config_flow.py b/tests/components/philips_js/test_config_flow.py
index 64ed2ee2a49836..1662a2a3fc2669 100644
--- a/tests/components/philips_js/test_config_flow.py
+++ b/tests/components/philips_js/test_config_flow.py
@@ -1,5 +1,5 @@
 """Test the Philips TV config flow."""
-from unittest.mock import ANY, patch
+from unittest.mock import ANY
 
 from haphilipsjs import PairingFailure
 import pytest
@@ -19,16 +19,7 @@
 
 from tests.common import MockConfigEntry
 
-
-@pytest.fixture(autouse=True)
-def mock_setup_entry():
-    """Disable component setup."""
-    with patch(
-        "homeassistant.components.philips_js.async_setup_entry", return_value=True
-    ) as mock_setup_entry, patch(
-        "homeassistant.components.philips_js.async_unload_entry", return_value=True
-    ):
-        yield mock_setup_entry
+pytestmark = pytest.mark.usefixtures("mock_setup_entry")
 
 
 @pytest.fixture
diff --git a/tests/components/renault/conftest.py b/tests/components/renault/conftest.py
index 6c62e5d22e2ee4..abf2108c0e2af7 100644
--- a/tests/components/renault/conftest.py
+++ b/tests/components/renault/conftest.py
@@ -1,8 +1,9 @@
 """Provide common Renault fixtures."""
+from collections.abc import Generator
 import contextlib
 from types import MappingProxyType
 from typing import Any
-from unittest.mock import patch
+from unittest.mock import AsyncMock, patch
 
 import pytest
 from renault_api.kamereon import exceptions, schemas
@@ -18,6 +19,15 @@
 from tests.common import MockConfigEntry, load_fixture
 
 
+@pytest.fixture(autouse=True)
+def mock_setup_entry() -> Generator[AsyncMock, None, None]:
+    """Override async_setup_entry."""
+    with patch(
+        "homeassistant.components.renault.async_setup_entry", return_value=True
+    ) as mock_setup_entry:
+        yield mock_setup_entry
+
+
 @pytest.fixture(name="vehicle_type", params=MOCK_VEHICLES.keys())
 def get_vehicle_type(request: pytest.FixtureRequest) -> str:
     """Parametrize vehicle type."""
diff --git a/tests/components/renault/test_config_flow.py b/tests/components/renault/test_config_flow.py
index 757b3239a7f1b9..5d933c03c657d5 100644
--- a/tests/components/renault/test_config_flow.py
+++ b/tests/components/renault/test_config_flow.py
@@ -1,5 +1,4 @@
 """Test the Renault config flow."""
-from collections.abc import Generator
 from unittest.mock import AsyncMock, PropertyMock, patch
 
 import pytest
@@ -22,14 +21,7 @@
 
 from tests.common import load_fixture
 
-
-@pytest.fixture(autouse=True)
-def mock_setup_entry() -> Generator[AsyncMock, None, None]:
-    """Override async_setup_entry."""
-    with patch(
-        "homeassistant.components.renault.async_setup_entry", return_value=True
-    ) as mock_setup_entry:
-        yield mock_setup_entry
+pytestmark = pytest.mark.usefixtures("mock_setup_entry")
 
 
 async def test_config_flow_single_account(
diff --git a/tests/components/samsungtv/conftest.py b/tests/components/samsungtv/conftest.py
index 73ad642f7e7aae..74c85ff6757f2a 100644
--- a/tests/components/samsungtv/conftest.py
+++ b/tests/components/samsungtv/conftest.py
@@ -1,7 +1,7 @@
 """Fixtures for Samsung TV."""
 from __future__ import annotations
 
-from collections.abc import Awaitable, Callable
+from collections.abc import Awaitable, Callable, Generator
 from datetime import datetime
 from socket import AddressFamily
 from typing import Any
@@ -25,6 +25,15 @@
 from .const import SAMPLE_DEVICE_INFO_UE48JU6400, SAMPLE_DEVICE_INFO_WIFI
 
 
+@pytest.fixture(autouse=True)
+def mock_setup_entry() -> Generator[AsyncMock, None, None]:
+    """Override async_setup_entry."""
+    with patch(
+        "homeassistant.components.samsungtv.async_setup_entry", return_value=True
+    ) as mock_setup_entry:
+        yield mock_setup_entry
+
+
 @pytest.fixture(autouse=True)
 async def silent_ssdp_scanner(hass):
     """Start SSDP component and get Scanner, prevent actual SSDP traffic."""
diff --git a/tests/components/samsungtv/test_config_flow.py b/tests/components/samsungtv/test_config_flow.py
index 32e9cef9968dc3..ac0072c88ce381 100644
--- a/tests/components/samsungtv/test_config_flow.py
+++ b/tests/components/samsungtv/test_config_flow.py
@@ -1,5 +1,4 @@
 """Tests for Samsung TV config flow."""
-from collections.abc import Generator
 import socket
 from unittest.mock import ANY, AsyncMock, Mock, call, patch
 
@@ -216,14 +215,7 @@
     "timeout": TIMEOUT_WEBSOCKET,
 }
 
-
-@pytest.fixture(autouse=True)
-def mock_setup_entry() -> Generator[AsyncMock, None, None]:
-    """Override async_setup_entry."""
-    with patch(
-        "homeassistant.components.samsungtv.async_setup_entry", return_value=True
-    ) as mock_setup_entry:
-        yield mock_setup_entry
+pytestmark = pytest.mark.usefixtures("mock_setup_entry")
 
 
 @pytest.mark.usefixtures("remote", "rest_api_failing")
diff --git a/tests/components/sfr_box/conftest.py b/tests/components/sfr_box/conftest.py
index 207c2939f1d3d4..4a3d164c7384d3 100644
--- a/tests/components/sfr_box/conftest.py
+++ b/tests/components/sfr_box/conftest.py
@@ -1,7 +1,7 @@
 """Provide common SFR Box fixtures."""
 from collections.abc import Generator
 import json
-from unittest.mock import patch
+from unittest.mock import AsyncMock, patch
 
 import pytest
 from sfrbox_api.models import DslInfo, SystemInfo
@@ -14,6 +14,15 @@
 from tests.common import MockConfigEntry, load_fixture
 
 
+@pytest.fixture(autouse=True)
+def mock_setup_entry() -> Generator[AsyncMock, None, None]:
+    """Override async_setup_entry."""
+    with patch(
+        "homeassistant.components.sfr_box.async_setup_entry", return_value=True
+    ) as mock_setup_entry:
+        yield mock_setup_entry
+
+
 @pytest.fixture(name="config_entry")
 def get_config_entry(hass: HomeAssistant) -> ConfigEntry:
     """Create and register mock config entry."""
diff --git a/tests/components/sfr_box/test_config_flow.py b/tests/components/sfr_box/test_config_flow.py
index 2d8e256de72843..c8130d5d617362 100644
--- a/tests/components/sfr_box/test_config_flow.py
+++ b/tests/components/sfr_box/test_config_flow.py
@@ -1,5 +1,4 @@
 """Test the SFR Box config flow."""
-from collections.abc import Generator
 import json
 from unittest.mock import AsyncMock, patch
 
@@ -15,14 +14,7 @@
 
 from tests.common import load_fixture
 
-
-@pytest.fixture(autouse=True)
-def mock_setup_entry() -> Generator[AsyncMock, None, None]:
-    """Override async_setup_entry."""
-    with patch(
-        "homeassistant.components.sfr_box.async_setup_entry", return_value=True
-    ) as mock_setup_entry:
-        yield mock_setup_entry
+pytestmark = pytest.mark.usefixtures("mock_setup_entry")
 
 
 async def test_config_flow_skip_auth(
diff --git a/tests/components/sleepiq/conftest.py b/tests/components/sleepiq/conftest.py
index 23c42ee7f6649b..0b652775cdc0e3 100644
--- a/tests/components/sleepiq/conftest.py
+++ b/tests/components/sleepiq/conftest.py
@@ -2,7 +2,7 @@
 from __future__ import annotations
 
 from collections.abc import Generator
-from unittest.mock import MagicMock, create_autospec, patch
+from unittest.mock import AsyncMock, MagicMock, create_autospec, patch
 
 from asyncsleepiq import (
     Side,
@@ -40,6 +40,15 @@
 }
 
 
+@pytest.fixture(autouse=True)
+def mock_setup_entry() -> Generator[AsyncMock, None, None]:
+    """Override async_setup_entry."""
+    with patch(
+        "homeassistant.components.sleepiq.async_setup_entry", return_value=True
+    ) as mock_setup_entry:
+        yield mock_setup_entry
+
+
 @pytest.fixture
 def mock_bed() -> MagicMock:
     """Mock a SleepIQBed object with sleepers and lights."""
diff --git a/tests/components/sleepiq/test_config_flow.py b/tests/components/sleepiq/test_config_flow.py
index f8a0a9bb05d558..0f251675892d99 100644
--- a/tests/components/sleepiq/test_config_flow.py
+++ b/tests/components/sleepiq/test_config_flow.py
@@ -1,5 +1,4 @@
 """Tests for the SleepIQ config flow."""
-from collections.abc import Generator
 from unittest.mock import AsyncMock, patch
 
 from asyncsleepiq import SleepIQLoginException, SleepIQTimeoutException
@@ -12,14 +11,7 @@
 
 from .conftest import SLEEPIQ_CONFIG, setup_platform
 
-
-@pytest.fixture(autouse=True)
-def mock_setup_entry() -> Generator[AsyncMock, None, None]:
-    """Override async_setup_entry."""
-    with patch(
-        "homeassistant.components.sleepiq.async_setup_entry", return_value=True
-    ) as mock_setup_entry:
-        yield mock_setup_entry
+pytestmark = pytest.mark.usefixtures("mock_setup_entry")
 
 
 async def test_import(hass: HomeAssistant) -> None:

From 6e0d0308249aae489a9b986100896bd8d6a376f7 Mon Sep 17 00:00:00 2001
From: epenet <6771947+epenet@users.noreply.github.com>
Date: Mon, 20 Feb 2023 11:07:58 +0000
Subject: [PATCH 3/4] Remove autouse in conftest

---
 tests/components/nibe_heatpump/conftest.py | 2 +-
 tests/components/onewire/conftest.py       | 2 +-
 tests/components/philips_js/conftest.py    | 2 +-
 tests/components/renault/conftest.py       | 2 +-
 tests/components/samsungtv/conftest.py     | 2 +-
 tests/components/sfr_box/conftest.py       | 2 +-
 tests/components/sleepiq/conftest.py       | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tests/components/nibe_heatpump/conftest.py b/tests/components/nibe_heatpump/conftest.py
index 2b298667063f20..36436c5ed9cf45 100644
--- a/tests/components/nibe_heatpump/conftest.py
+++ b/tests/components/nibe_heatpump/conftest.py
@@ -10,7 +10,7 @@
 import pytest
 
 
-@pytest.fixture(autouse=True)
+@pytest.fixture
 def mock_setup_entry() -> Generator[AsyncMock, None, None]:
     """Make sure we never actually run setup."""
     with patch(
diff --git a/tests/components/onewire/conftest.py b/tests/components/onewire/conftest.py
index b0079f6c09c588..031b29d47a7925 100644
--- a/tests/components/onewire/conftest.py
+++ b/tests/components/onewire/conftest.py
@@ -15,7 +15,7 @@
 from tests.common import MockConfigEntry
 
 
-@pytest.fixture(autouse=True)
+@pytest.fixture
 def mock_setup_entry() -> Generator[AsyncMock, None, None]:
     """Override async_setup_entry."""
     with patch(
diff --git a/tests/components/philips_js/conftest.py b/tests/components/philips_js/conftest.py
index 898f007088a073..bc94d721cc98a1 100644
--- a/tests/components/philips_js/conftest.py
+++ b/tests/components/philips_js/conftest.py
@@ -12,7 +12,7 @@
 from tests.common import MockConfigEntry, mock_device_registry
 
 
-@pytest.fixture(autouse=True)
+@pytest.fixture
 def mock_setup_entry() -> Generator[AsyncMock, None, None]:
     """Disable component setup."""
     with patch(
diff --git a/tests/components/renault/conftest.py b/tests/components/renault/conftest.py
index abf2108c0e2af7..312ddbf60924dc 100644
--- a/tests/components/renault/conftest.py
+++ b/tests/components/renault/conftest.py
@@ -19,7 +19,7 @@
 from tests.common import MockConfigEntry, load_fixture
 
 
-@pytest.fixture(autouse=True)
+@pytest.fixture
 def mock_setup_entry() -> Generator[AsyncMock, None, None]:
     """Override async_setup_entry."""
     with patch(
diff --git a/tests/components/samsungtv/conftest.py b/tests/components/samsungtv/conftest.py
index 74c85ff6757f2a..0e95dfa28a9d3e 100644
--- a/tests/components/samsungtv/conftest.py
+++ b/tests/components/samsungtv/conftest.py
@@ -25,7 +25,7 @@
 from .const import SAMPLE_DEVICE_INFO_UE48JU6400, SAMPLE_DEVICE_INFO_WIFI
 
 
-@pytest.fixture(autouse=True)
+@pytest.fixture
 def mock_setup_entry() -> Generator[AsyncMock, None, None]:
     """Override async_setup_entry."""
     with patch(
diff --git a/tests/components/sfr_box/conftest.py b/tests/components/sfr_box/conftest.py
index 4a3d164c7384d3..1857ffeec303c7 100644
--- a/tests/components/sfr_box/conftest.py
+++ b/tests/components/sfr_box/conftest.py
@@ -14,7 +14,7 @@
 from tests.common import MockConfigEntry, load_fixture
 
 
-@pytest.fixture(autouse=True)
+@pytest.fixture
 def mock_setup_entry() -> Generator[AsyncMock, None, None]:
     """Override async_setup_entry."""
     with patch(
diff --git a/tests/components/sleepiq/conftest.py b/tests/components/sleepiq/conftest.py
index 0b652775cdc0e3..9932b75ebdbe6f 100644
--- a/tests/components/sleepiq/conftest.py
+++ b/tests/components/sleepiq/conftest.py
@@ -40,7 +40,7 @@
 }
 
 
-@pytest.fixture(autouse=True)
+@pytest.fixture
 def mock_setup_entry() -> Generator[AsyncMock, None, None]:
     """Override async_setup_entry."""
     with patch(

From 18047ba4cf8529a52e6c73b134725a87ae87a47f Mon Sep 17 00:00:00 2001
From: epenet <6771947+epenet@users.noreply.github.com>
Date: Mon, 20 Feb 2023 13:19:16 +0000
Subject: [PATCH 4/4] Remove autouse from scaffold also

---
 script/scaffold/templates/config_flow/tests/conftest.py        | 2 +-
 script/scaffold/templates/config_flow_helper/tests/conftest.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/script/scaffold/templates/config_flow/tests/conftest.py b/script/scaffold/templates/config_flow/tests/conftest.py
index c718121d79d519..dab3d971a3baec 100644
--- a/script/scaffold/templates/config_flow/tests/conftest.py
+++ b/script/scaffold/templates/config_flow/tests/conftest.py
@@ -5,7 +5,7 @@
 import pytest
 
 
-@pytest.fixture(autouse=True)
+@pytest.fixture
 def mock_setup_entry() -> Generator[AsyncMock, None, None]:
     """Override async_setup_entry."""
     with patch(
diff --git a/script/scaffold/templates/config_flow_helper/tests/conftest.py b/script/scaffold/templates/config_flow_helper/tests/conftest.py
index c718121d79d519..dab3d971a3baec 100644
--- a/script/scaffold/templates/config_flow_helper/tests/conftest.py
+++ b/script/scaffold/templates/config_flow_helper/tests/conftest.py
@@ -5,7 +5,7 @@
 import pytest
 
 
-@pytest.fixture(autouse=True)
+@pytest.fixture
 def mock_setup_entry() -> Generator[AsyncMock, None, None]:
     """Override async_setup_entry."""
     with patch(